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

SOLR-7599: Removed some distribTearDown methods that were left over 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1682181 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2015-05-28 09:28:18 +00:00
parent bb0176fdd2
commit 8182169bb4
4 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
View File

@ -38,26 +38,6 @@ public class LeaderInitiatedRecoveryOnCommitTest extends BasicDistributedZkTest
fixShardCount(4);
}
@Override
public void distribSetUp() throws Exception {
super.distribSetUp();
System.setProperty("numShards", Integer.toString(sliceCount));
}
@Override
public void distribTearDown() throws Exception {
System.clearProperty("numShards");
super.distribTearDown();
// close socket proxies after super.distribTearDown
if (!proxies.isEmpty()) {
for (SocketProxy proxy : proxies.values()) {
proxy.close();
}
}
}
@Override
@Test
public void test() throws Exception {

7
solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java
View File

@ -42,16 +42,9 @@ public class RollingRestartTest extends AbstractFullDistribZkTestBase {
@Override
public void distribSetUp() throws Exception {
super.distribSetUp();
System.setProperty("numShards", Integer.toString(sliceCount));
useFactory("solr.StandardDirectoryFactory");
}
@Override
public void distribTearDown() throws Exception {
System.clearProperty("numShards");
super.distribTearDown();
}
@Test
public void test() throws Exception {
waitForRecoveriesToFinish(false);

2
solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
View File

@ -88,7 +88,6 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
public void distribSetUp() throws Exception {
super.distribSetUp();
useJettyDataDir = false;
System.setProperty("solr.xml.persist", "true");
}
protected String getSolrXml() {
@ -261,6 +260,5 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
@Override
public void distribTearDown() throws Exception {
super.distribTearDown();
System.clearProperty("solr.xml.persist");
}
}

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

@ -114,16 +114,6 @@ public class TestBlobHandler extends AbstractFullDistribZkTestBase {
assertTrue(response1.isSuccess());
}
@Override
public void distribTearDown() throws Exception {
super.distribTearDown();
System.clearProperty("numShards");
System.clearProperty("zkHost");
// insurance
DirectUpdateHandler2.commitOnClose = true;
}
public static void postAndCheck(CloudSolrClient cloudClient, String baseUrl, String blobName, ByteBuffer bytes, int count) throws Exception {
postData(cloudClient, baseUrl, blobName, bytes);