You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2014/02/25 15:08:39 UTC

svn commit: r1571702 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java

Author: noble
Date: Tue Feb 25 14:08:39 2014
New Revision: 1571702

URL: http://svn.apache.org/r1571702
Log:
SOLR-5069 fixing test failure

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1571702&r1=1571701&r2=1571702&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Tue Feb 25 14:08:39 2014
@@ -1189,8 +1189,6 @@ public class CollectionsAPIDistributedZk
     CloudSolrServer client = createCloudClient(null);
     try {
       createCollection(collectionName, client,2,2);
-
-      waitForRecoveriesToFinish(collectionName, false);
       String newReplicaName = Assign.assignNode(collectionName , client.getZkStateReader().getClusterState() );
       ArrayList<String> nodeList = new ArrayList<String>(client.getZkStateReader().getClusterState().getLiveNodes());
       Collections.shuffle(nodeList);
@@ -1270,7 +1268,8 @@ public class CollectionsAPIDistributedZk
         MAX_SHARDS_PER_NODE, maxShardsPerNode,
         NUM_SLICES, numShards);
     Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
-    createCollection(collectionInfos, COLL_NAME, props, client);
+    createCollection(collectionInfos, COLL_NAME, props, client,"conf1");
+    waitForRecoveriesToFinish(COLL_NAME, false);
   }
   
   @Override