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 2011/01/12 17:10:15 UTC
svn commit: r1058214 - in
/lucene/dev/trunk/solr/src/test/org/apache/solr/cloud:
AbstractZkTestCase.java ZkControllerTest.java
Author: simonw
Date: Wed Jan 12 16:10:14 2011
New Revision: 1058214
URL: http://svn.apache.org/viewvc?rev=1058214&view=rev
Log:
fixed testcase which failed with -Dtests.multiplier > 1
Modified:
lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1058214&r1=1058213&r2=1058214&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Wed Jan 12 16:10:14 2011
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
+import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -126,4 +127,20 @@ public abstract class AbstractZkTestCase
zkClient.makePath("/solr");
zkClient.close();
}
+
+ static void tryCleanSolrZkNode(String zkHost) throws Exception {
+ tryCleanPath(zkHost, "/solr");
+ }
+
+ static void tryCleanPath(String zkHost, String path) throws Exception {
+ SolrZkClient zkClient = new SolrZkClient(zkHost, TIMEOUT);
+ if (zkClient.exists(path)) {
+ List<String> children = zkClient.getChildren(path, null);
+ for (String string : children) {
+ tryCleanPath(zkHost, path+"/"+string);
+ }
+ zkClient.delete(path, -1);
+ }
+ zkClient.close();
+ }
}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1058214&r1=1058213&r2=1058214&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java Wed Jan 12 16:10:14 2011
@@ -71,7 +71,7 @@ public class ZkControllerTest extends So
try {
server = new ZkTestServer(zkDir);
server.run();
-
+ AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
AbstractZkTestCase.makeSolrZkNode(server.getZkHost());
zkClient = new SolrZkClient(server.getZkAddress(), TIMEOUT);