Apache Solr open-source search software
SOLR-16093: Tests: don't require IPv6 (#2484)
David Smiley52042187f764
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policyindex 0c0c2608b02..9dba0b9885d 100644--- a/gradle/testing/randomization/policies/solr-tests.policy+++ b/gradle/testing/randomization/policies/solr-tests.policy@@ -47,9 +47,9 @@ grant {permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";// "dead hosts", we try to keep it fast- permission java.net.SocketPermission "[::1]:4", "connect,resolve";- permission java.net.SocketPermission "[::1]:6", "connect,resolve";- permission java.net.SocketPermission "[::1]:8", "connect,resolve";+ permission java.net.SocketPermission "127.0.0.1:4", "connect,resolve";+ permission java.net.SocketPermission "127.0.0.1:6", "connect,resolve";+ permission java.net.SocketPermission "127.0.0.1:8", "connect,resolve";// Basic permissions needed for Lucene to work:permission java.util.PropertyPermission "*", "read,write";diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policyindex 1dd9db3aef8..48242b23324 100644--- a/solr/server/etc/security.policy+++ b/solr/server/etc/security.policy@@ -54,10 +54,6 @@ grant {permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect,resolve";permission java.net.SocketPermission "127.0.0.1:1024-", "accept,listen,connect,resolve";permission java.net.SocketPermission "[::1]:1024-", "accept,listen,connect,resolve";- // "dead hosts", we try to keep it fast- permission java.net.SocketPermission "[::1]:4", "connect,resolve";- permission java.net.SocketPermission "[::1]:6", "connect,resolve";- permission java.net.SocketPermission "[::1]:8", "connect,resolve";// Basic permissions needed for Lucene to work:permission java.util.PropertyPermission "*", "read,write";diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 902192fbbf9..55ad19495e0 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -366,19 +366,19 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {* a "dead" host, if you try to connect to it, it will likely fail fast please consider using* mocks and not real networking to simulate failure*/- public static final String DEAD_HOST_1 = "[::1]:4";+ public static final String DEAD_HOST_1 = "127.0.0.1:4";/*** a "dead" host, if you try to connect to it, it will likely fail fast please consider using* mocks and not real networking to simulate failure*/- public static final String DEAD_HOST_2 = "[::1]:6";+ public static final String DEAD_HOST_2 = "127.0.0.1:6";/*** a "dead" host, if you try to connect to it, it will likely fail fast please consider using* mocks and not real networking to simulate failure*/- public static final String DEAD_HOST_3 = "[::1]:8";+ public static final String DEAD_HOST_3 = "127.0.0.1:8";/*** Assumes that Mockito/Bytebuddy is available and can be used to mock classes (e.g., fails if