You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2019/04/03 15:08:57 UTC
[lucene-solr] branch master updated: SOLR-13075: Harden
SaslZkACLProviderTest (Kevin Risden, Hrishikesh Gadre, Peter Cseh)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 6596ed1 SOLR-13075: Harden SaslZkACLProviderTest (Kevin Risden, Hrishikesh Gadre, Peter Cseh)
6596ed1 is described below
commit 6596ed1c16de72133fc9f86dafce46daf3bdf724
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Apr 3 10:13:57 2019 -0400
SOLR-13075: Harden SaslZkACLProviderTest (Kevin Risden, Hrishikesh Gadre, Peter Cseh)
Signed-off-by: Kevin Risden <kr...@apache.org>
---
.../src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java | 10 +++++-----
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 8 +++++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
index 9d1f0a3..f5eca1f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
@@ -57,11 +57,13 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
assumeFalse("FIXME: SOLR-7040: This test fails under IBM J9",
Constants.JAVA_VENDOR.startsWith("IBM"));
System.setProperty("solrcloud.skip.autorecovery", "true");
+ System.setProperty("hostName", "localhost");
}
@AfterClass
- public static void afterClass() throws InterruptedException {
+ public static void afterClass() {
System.clearProperty("solrcloud.skip.autorecovery");
+ System.clearProperty("hostName");
}
@Override
@@ -78,11 +80,8 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
System.setProperty("zkHost", zkServer.getZkAddress());
- SolrZkClient zkClient = new SolrZkClientWithACLs(zkServer.getZkHost(), AbstractZkTestCase.TIMEOUT);
- try {
+ try (SolrZkClient zkClient = new SolrZkClientWithACLs(zkServer.getZkHost(), AbstractZkTestCase.TIMEOUT)) {
zkClient.makePath("/solr", false, true);
- } finally {
- zkClient.close();
}
setupZNodes();
@@ -110,6 +109,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
@Override
public void tearDown() throws Exception {
+ System.clearProperty("zkHost");
zkServer.shutdown();
super.tearDown();
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 9c8cf1b..27c551e 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -456,7 +456,8 @@ public class ZkTestServer {
}
public String getZkHost() {
- return "127.0.0.1:" + zkServer.getLocalPort();
+ String hostName = System.getProperty("hostName", "127.0.0.1");
+ return hostName + ":" + zkServer.getLocalPort();
}
public String getZkAddress() {
@@ -469,9 +470,10 @@ public class ZkTestServer {
* @return the connection string
*/
public String getZkAddress(String chroot) {
- if (!chroot.startsWith("/"))
+ if (!chroot.startsWith("/")) {
chroot = "/" + chroot;
- return "127.0.0.1:" + zkServer.getLocalPort() + chroot;
+ }
+ return getZkHost() + chroot;
}
/**