From a60156aae3d3ebc8a1508df1254e717ae80fdfd5 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Sun, 10 Mar 2013 21:37:52 +0000 Subject: [PATCH] tests: this timeout needs to be even higher for apache freebsd, and this test currently requires 4 shards because I have seen shard1 get one node and shard2 get two git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1454926 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/org/apache/solr/cloud/BasicDistributedZk2Test.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java index 8a01d93f668..0635b758dc6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java @@ -68,7 +68,7 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase { fixShardCount = true; sliceCount = 2; - shardCount = 3; + shardCount = 4; } /* @@ -253,7 +253,7 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase { int oldLiveNodes = cloudClient.getZkStateReader().getZkClient().getChildren(ZkStateReader.LIVE_NODES_ZKNODE, null, true).size(); - assertEquals(4, oldLiveNodes); + assertEquals(5, oldLiveNodes); // kill a shard CloudJettyRunner deadShard = chaosMonkey.stopShard(SHARD1, 0); @@ -288,7 +288,7 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase { long numFound1 = cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound(); - cloudClient.getZkStateReader().getLeaderRetry(DEFAULT_COLLECTION, SHARD1, 30000); + cloudClient.getZkStateReader().getLeaderRetry(DEFAULT_COLLECTION, SHARD1, 45000); index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1, "specific doc!");