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

SOLR-8279: One of two tests was not calling TestInjection#clear after using it. Call clear in the Solr base test class instead. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1720841 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2015-12-18 19:02:30 +00:00
parent 5232f791f6
commit 84005ad61f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java
View File

@ -74,7 +74,6 @@ public class RestartWhileUpdatingTest extends AbstractFullDistribZkTestBase {
System.clearProperty("leaderVoteWait");
System.clearProperty("solr.autoCommit.maxTime");
System.clearProperty("solr.autoSoftCommit.maxTime");
TestInjection.reset();
}
@Test

2
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
View File

@ -92,6 +92,7 @@ import org.apache.solr.util.RefCounted;
import org.apache.solr.util.RevertDefaultThreadHandlerRule;
import org.apache.solr.util.SSLTestConfig;
import org.apache.solr.util.TestHarness;
import org.apache.solr.util.TestInjection;
import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@ -240,6 +241,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
coreName = DEFAULT_TEST_CORENAME;
} finally {
ObjectReleaseTracker.clear();
TestInjection.reset();
initCoreDataDir = null;
System.clearProperty("zookeeper.forceSync");
System.clearProperty("jetty.testMode");