You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/01/20 00:23:07 UTC
svn commit: r1559600 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
Author: markrmiller
Date: Sun Jan 19 23:23:07 2014
New Revision: 1559600
URL: http://svn.apache.org/r1559600
Log:
SOLR-5608: Harden test.
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=1559600&r1=1559599&r2=1559600&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 Sun Jan 19 23:23:07 2014
@@ -375,6 +375,11 @@ public class CollectionsAPIDistributedZk
ChaosMonkey.stop(jettys.get(0));
ChaosMonkey.stop(jettys.get(1));
+ // wait for leaders to settle out
+ for (int i = 1; i < 4; i++) {
+ cloudClient.getZkStateReader().getLeaderRetry("halfdeletedcollection2", "shard" + i);
+ }
+
baseUrl = getBaseUrl((HttpSolrServer) clients.get(2));
// remove a collection
@@ -387,7 +392,7 @@ public class CollectionsAPIDistributedZk
createNewSolrServer("", baseUrl).request(request);
cloudClient.getZkStateReader().updateClusterState(true);
- assertFalse(cloudClient.getZkStateReader().getClusterState().hasCollection("halfdeletedcollection2"));
+ assertFalse("Still found collection that should be gone", cloudClient.getZkStateReader().getClusterState().hasCollection("halfdeletedcollection2"));
}