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

Revert the AbstractZkTestCase changes for now 

was: LUCENE-6795: Fix Solr tests that break RamUsageTester on Java 9 Jigsaw

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1702831 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2015-09-13 21:32:48 +00:00
parent 690f6d6578
commit 8d44733846
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
View File

@ -46,6 +46,15 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
public static File SOLRHOME;
static {
try {
SOLRHOME = new File(TEST_HOME());
} catch (RuntimeException e) {
log.warn("TEST_HOME() does not exist - solrj test?");
// solrj tests not working with TEST_HOME()
// must override getSolrHome
}
}
protected static ZkTestServer zkServer;
@ -54,14 +63,6 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
@BeforeClass
public static void azt_beforeClass() throws Exception {
try {
SOLRHOME = new File(TEST_HOME());
} catch (RuntimeException e) {
log.warn("TEST_HOME() does not exist - solrj test?");
// solrj tests not working with TEST_HOME()
// must override getSolrHome
}
zkDir = createTempDir("zkData").toFile().getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
@ -160,7 +161,6 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
zkServer = null;
}
zkDir = null;
SOLRHOME = null;
}
protected void printLayout(String zkHost) throws Exception {