You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/02/23 12:44:00 UTC
svn commit: r1292753 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
Author: siren
Date: Thu Feb 23 11:44:00 2012
New Revision: 1292753
URL: http://svn.apache.org/viewvc?rev=1292753&view=rev
Log:
SOLR-3080: add couple more asserts
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1292753&r1=1292752&r2=1292753&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Thu Feb 23 11:44:00 2012
@@ -22,6 +22,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import junit.framework.Assert;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -197,6 +199,8 @@ public class ZkControllerTest extends So
assertNotNull(reader.getLeaderUrl("collection1", "shard1", 15000));
+ assertEquals("Shard(s) missing from cloudstate", 2, zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size());
+
// unregister current leader
final ZkNodeProps shard1LeaderProps = reader.getLeaderProps(
"collection1", "shard1");
@@ -215,6 +219,9 @@ public class ZkControllerTest extends So
leaderUrl, reader.getLeaderUrl("collection1", "shard1", 15000));
assertNotNull("New leader was null.",
reader.getLeaderUrl("collection1", "shard1", 15000));
+
+ Thread.sleep(1000);
+ assertEquals("shard was not unregistered", 1, zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size());
} finally {
if (DEBUG) {
if (zkController != null) {