svn commit: r1630542 - /lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java

[th...@apache.org]

Author: thelabdude
Date: Thu Oct  9 17:54:52 2014
New Revision: 1630542

URL: http://svn.apache.org/r1630542
Log:
SOLR-6157: re-enable this test on branch_5x as it seems to be passing consistently now on trunk

Modified:
    lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java?rev=1630542&r1=1630541&r2=1630542&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java Thu Oct  9 17:54:52 2014
@@ -43,13 +43,14 @@ import org.junit.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+//@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6157")
+
 /**
  * Tests a client application's ability to get replication factor
  * information back from the cluster after an add or update.
  */
 @Slow
 @SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
-@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6157")
 public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
   
   private static final transient Logger log = 
@@ -140,6 +141,8 @@ public class ReplicationFactorTest exten
     log.info("Testing replication factor handling for repfacttest_c8n_1x3");
     testRf3();
 
+    waitForThingsToLevelOut(30000);
+
     // test handling when not using direct updates
     log.info("Now testing replication factor handling for repfacttest_c8n_2x2");
     testRf2NotUsingDirectUpdates();