Apache Solr open-source search software
Fix TestReplicationHandler.testUrlAllowListFailure
Jason Gerlowskiffe9f2c4d6ac
diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.javaindex 3051c06802c..6657453a2d9 100644--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java@@ -27,6 +27,7 @@ import java.nio.charset.StandardCharsets;import java.nio.file.FileSystems;import java.nio.file.Files;import java.nio.file.Path;+import java.nio.file.StandardCopyOption;import java.util.ArrayList;import java.util.Properties;import java.util.concurrent.TimeUnit;@@ -61,6 +62,12 @@ public final class ReplicationTestHelper {+ FileSystems.getDefault().getSeparator();public static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {+ Files.copy(+ SolrTestCaseJ4.TEST_HOME().resolve("solr.xml"),+ Path.of(instance.getHomeDir(), "solr.xml"),+ StandardCopyOption.REPLACE_EXISTING);+ Properties nodeProperties = new Properties();+ nodeProperties.setProperty("solr.data.dir", instance.getDataDir());JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();JettySolrRunner jetty =new JettySolrRunner(instance.getHomeDir(), new Properties(), jettyConfig);diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex b927b918023..11202518ebb 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -255,7 +255,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {public void testUrlAllowList() throws Exception {// Run another test with URL allow-list enabled and allow-list is empty.// Expect an exception because the leader URL is not allowed.- systemClearPropertySolrEnableUrlAllowList();+ systemSetPropertyEnableUrlAllowList(true);SolrException e = expectThrows(SolrException.class, this::doTestDetails);assertTrue(e.getMessage()