You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/05/28 11:28:18 UTC
svn commit: r1682181 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr:
cloud/LeaderInitiatedRecoveryOnCommitTest.java
cloud/RollingRestartTest.java cloud/SharedFSAutoReplicaFailoverTest.java
handler/TestBlobHandler.java
Author: shalin
Date: Thu May 28 09:28:18 2015
New Revision: 1682181
URL: http://svn.apache.org/r1682181
Log:
SOLR-7599: Removed some distribTearDown methods that were left over
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java?rev=1682181&r1=1682180&r2=1682181&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java Thu May 28 09:28:18 2015
@@ -39,26 +39,6 @@ public class LeaderInitiatedRecoveryOnCo
}
@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 {
oneShardTest();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java?rev=1682181&r1=1682180&r2=1682181&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java Thu May 28 09:28:18 2015
@@ -42,16 +42,9 @@ public class RollingRestartTest extends
@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);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java?rev=1682181&r1=1682180&r2=1682181&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java Thu May 28 09:28:18 2015
@@ -88,7 +88,6 @@ public class SharedFSAutoReplicaFailover
public void distribSetUp() throws Exception {
super.distribSetUp();
useJettyDataDir = false;
- System.setProperty("solr.xml.persist", "true");
}
protected String getSolrXml() {
@@ -261,6 +260,5 @@ public class SharedFSAutoReplicaFailover
@Override
public void distribTearDown() throws Exception {
super.distribTearDown();
- System.clearProperty("solr.xml.persist");
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java?rev=1682181&r1=1682180&r2=1682181&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java Thu May 28 09:28:18 2015
@@ -114,16 +114,6 @@ public class TestBlobHandler extends Abs
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);