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 2017/02/11 22:21:46 UTC
[2/3] lucene-solr:master: SOLR-10125: CollectionsAPIDistributedZkTest
is too fragile.
SOLR-10125: CollectionsAPIDistributedZkTest is too fragile.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/11a54aa5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/11a54aa5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/11a54aa5
Branch: refs/heads/master
Commit: 11a54aa5a9092238b6e22b9ee4df059491561ebb
Parents: a3bfc3e
Author: markrmiller <ma...@apache.org>
Authored: Sat Feb 11 11:36:16 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sat Feb 11 17:08:42 2017 -0500
----------------------------------------------------------------------
.../apache/solr/cloud/CollectionsAPIDistributedZkTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a54aa5/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
index 132d071..c3d1a86 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
@@ -86,6 +86,8 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@BeforeClass
public static void beforeCollectionsAPIDistributedZkTest() {
+ // we don't want this test to have zk timeouts
+ System.setProperty("zkClientTimeout", "240000");
TestInjection.randomDelayInCoreCreation = "true:20";
System.setProperty("validateAfterInactivity", "200");
}
@@ -100,7 +102,11 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@Before
public void clearCluster() throws Exception {
- cluster.deleteAllCollections();
+ try {
+ cluster.deleteAllCollections();
+ } finally {
+ System.clearProperty("zkClientTimeout");
+ }
}
@Test