mirror of https://github.com/apache/lucene.git
SOLR-6775: Do not attempt cleanup of temp directory because it is handled by test framework
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1659149 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d0ca43081f
commit
f2a0440c25
|
@ -134,8 +134,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
|
|||
super.tearDown();
|
||||
masterJetty.stop();
|
||||
slaveJetty.stop();
|
||||
master.tearDown();
|
||||
slave.tearDown();
|
||||
masterJetty = slaveJetty = null;
|
||||
master = slave = null;
|
||||
masterClient.close();
|
||||
|
@ -344,9 +342,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
|
|||
try {
|
||||
if (repeaterJetty != null) repeaterJetty.stop();
|
||||
} catch (Exception e) { /* :NOOP: */ }
|
||||
try {
|
||||
if (repeater != null) repeater.tearDown();
|
||||
} catch (Exception e) { /* :NOOP: */ }
|
||||
if (repeaterClient != null) repeaterClient.close();
|
||||
}
|
||||
}
|
||||
|
@ -909,7 +904,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
|
|||
} finally {
|
||||
if (repeater != null) {
|
||||
repeaterJetty.stop();
|
||||
repeater.tearDown();
|
||||
repeaterJetty = null;
|
||||
}
|
||||
if (repeaterClient != null) {
|
||||
|
@ -1505,10 +1499,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
|
|||
"solrconfig.snippet.randomindexconfig.xml");
|
||||
}
|
||||
|
||||
public void tearDown() throws Exception {
|
||||
IOUtils.rm(homeDir.toPath());
|
||||
}
|
||||
|
||||
public void copyConfigFile(String srcFile, String destFile)
|
||||
throws IOException {
|
||||
copyFile(getFile(srcFile),
|
||||
|
|
|
@ -112,7 +112,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
|
|||
masterClient.close();
|
||||
masterClient = null;
|
||||
masterJetty.stop();
|
||||
master.tearDown();
|
||||
masterJetty = null;
|
||||
master = null;
|
||||
}
|
||||
|
@ -167,7 +166,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
|
|||
|
||||
Path[] snapDir = new Path[2];
|
||||
boolean namedBackup = random().nextBoolean();
|
||||
try {
|
||||
String firstBackupTimestamp = null;
|
||||
|
||||
String[] backupNames = null;
|
||||
|
@ -214,14 +212,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
|
|||
if(namedBackup) {
|
||||
testDeleteNamedBackup(backupNames);
|
||||
}
|
||||
|
||||
} finally {
|
||||
if(!namedBackup) {
|
||||
for (int i = 0; i < snapDir.length; i++) {
|
||||
org.apache.lucene.util.IOUtils.rm(snapDir[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void testDeleteNamedBackup(String backupNames[]) throws InterruptedException, IOException {
|
||||
|
|
Loading…
Reference in New Issue