You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/04/05 15:49:55 UTC

[lucene-solr] branch branch_8x updated: SOLR-13075: Harden SaslZkACLProviderTest. Put AwaitsFix back

This is an automated email from the ASF dual-hosted git repository.

erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 18dc7a5  SOLR-13075: Harden SaslZkACLProviderTest. Put AwaitsFix back
18dc7a5 is described below

commit 18dc7a5c96373ff044d6353a8247ab1d271962de
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Fri Apr 5 08:47:36 2019 -0700

    SOLR-13075: Harden SaslZkACLProviderTest. Put AwaitsFix back
    
    (cherry picked from commit 03d76c611b2ebe368edd4e3245d5be2a36cd73b0)
---
 solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
index f5eca1f..b362bfa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
@@ -115,6 +115,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
   }
 
   @Test
+  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13075")
   public void testSaslZkACLProvider() throws Exception {
     // Test with Sasl enabled
     SolrZkClient zkClient = new SolrZkClientWithACLs(zkServer.getZkAddress(), AbstractZkTestCase.TIMEOUT);