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

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:
Shalin Shekhar Mangar 2015-02-12 05:03:58 +00:00
parent d0ca43081f
commit f2a0440c25
2 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
View File

@ -134,8 +134,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
super.tearDown(); super.tearDown();
masterJetty.stop(); masterJetty.stop();
slaveJetty.stop(); slaveJetty.stop();
master.tearDown();
slave.tearDown();
masterJetty = slaveJetty = null; masterJetty = slaveJetty = null;
master = slave = null; master = slave = null;
masterClient.close(); masterClient.close();
@ -344,9 +342,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
try { try {
if (repeaterJetty != null) repeaterJetty.stop(); if (repeaterJetty != null) repeaterJetty.stop();
} catch (Exception e) { /* :NOOP: */ } } catch (Exception e) { /* :NOOP: */ }
try {
if (repeater != null) repeater.tearDown();
} catch (Exception e) { /* :NOOP: */ }
if (repeaterClient != null) repeaterClient.close(); if (repeaterClient != null) repeaterClient.close();
} }
} }
@ -909,7 +904,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
} finally { } finally {
if (repeater != null) { if (repeater != null) {
repeaterJetty.stop(); repeaterJetty.stop();
repeater.tearDown();
repeaterJetty = null; repeaterJetty = null;
} }
if (repeaterClient != null) { if (repeaterClient != null) {
@ -1505,10 +1499,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
"solrconfig.snippet.randomindexconfig.xml"); "solrconfig.snippet.randomindexconfig.xml");
} }
public void tearDown() throws Exception {
IOUtils.rm(homeDir.toPath());
}
public void copyConfigFile(String srcFile, String destFile) public void copyConfigFile(String srcFile, String destFile)
throws IOException { throws IOException {
copyFile(getFile(srcFile), copyFile(getFile(srcFile),

10
solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
View File

@ -112,7 +112,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
masterClient.close(); masterClient.close();
masterClient = null; masterClient = null;
masterJetty.stop(); masterJetty.stop();
master.tearDown();
masterJetty = null; masterJetty = null;
master = null; master = null;
} }
@ -167,7 +166,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
Path[] snapDir = new Path[2]; Path[] snapDir = new Path[2];
boolean namedBackup = random().nextBoolean(); boolean namedBackup = random().nextBoolean();
try {
String firstBackupTimestamp = null; String firstBackupTimestamp = null;
String[] backupNames = null; String[] backupNames = null;
@ -214,14 +212,6 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
if(namedBackup) { if(namedBackup) {
testDeleteNamedBackup(backupNames); 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 { private void testDeleteNamedBackup(String backupNames[]) throws InterruptedException, IOException {