Apache Solr open-source search software
SolrTestCaseJ4: don't reset HttpClient SSL stuff (#3037)
David Smiley520e649c9fa2
diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.javaindex d510f024c6a..7bf580a865c 100644--- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java@@ -37,6 +37,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.SSLTestConfig;+import org.junit.After;import org.junit.Test;/**@@ -47,6 +48,11 @@ import org.junit.Test;@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018public class SSLMigrationTest extends AbstractFullDistribZkTestBase {+ @After+ public void afterTest() {+ HttpClientUtil.resetHttpClientBuilder(); // also resets SocketFactoryRegistryProvider+ }+@Testpublic void test() throws Exception {// Migrate from HTTP -> HTTPS -> HTTP@@ -64,7 +70,7 @@ public class SSLMigrationTest extends AbstractFullDistribZkTestBase {}HttpClientUtil.setSocketFactoryRegistryProvider(- sslConfig.buildClientSocketFactoryRegistryProvider());+ sslConfig.buildClientSocketFactoryRegistryProvider()); // we reset in Afterfor (int i = 0; i < this.jettys.size(); i++) {JettySolrRunner runner = jettys.get(i);JettyConfig config =diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.javaindex 18ec44e430c..5602457c0c1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java@@ -104,8 +104,8 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {public void testNoSsl() throws Exception {final SSLTestConfig sslConfig = new SSLTestConfig(false, false);HttpClientUtil.setSocketFactoryRegistryProvider(- sslConfig.buildClientSocketFactoryRegistryProvider());- Http2SolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig());+ sslConfig.buildClientSocketFactoryRegistryProvider()); // must be reset+ Http2SolrClient.setDefaultSSLConfig(sslConfig.buildClientSSLConfig()); // must be resetSystem.setProperty(ZkStateReader.URL_SCHEME, "http");checkClusterWithNodeReplacement(sslConfig);}diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex a5e256d2fac..e1e6971467c 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -327,8 +327,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {System.clearProperty(URL_SCHEME);System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");System.clearProperty("solr.zkclienttmeout");- HttpClientUtil.resetHttpClientBuilder();- Http2SolrClient.resetSslContextFactory();clearNumericTypesProperties();