Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3199: this test was not clearing the bootstrap_confdir sys prop it sets 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1296847 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-03-04 18:06:04 +00:00
parent 8c7c6890ad
commit 5007616835
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
View File

@ -223,6 +223,9 @@ public class ZkControllerTest extends SolrTestCaseJ4 {
Thread.sleep(2000);
assertEquals("shard was not unregistered", 1, zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size());
} finally {
System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
System.clearProperty("bootstrap_confdir");
if (DEBUG) {
if (zkController != null) {
zkClient.printLayoutToStdOut();
@ -235,8 +238,6 @@ public class ZkControllerTest extends SolrTestCaseJ4 {
zkController.close();
}
server.shutdown();
System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
}
}