accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Fix MiniAccumuloClusterExistingZooKeepersTest
Date Fri, 28 Feb 2020 00:41:20 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 0027508  Fix MiniAccumuloClusterExistingZooKeepersTest
0027508 is described below

commit 00275086824bbca3fc7711bda14201e9b01e212c
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Feb 27 19:39:06 2020 -0500

    Fix MiniAccumuloClusterExistingZooKeepersTest
    
    * Follow up issue from #1531
    * Update curator to latest for zookeeper testing server
    * Disable ZK adminServer in test, because it listens on 8080 by default,
      which can conflict with other services in the testing environment, and
      it is not needed
---
 .../accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 2 ++
 pom.xml                                                                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
index ac24d8f..609dba0 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -63,6 +63,8 @@ public class MiniAccumuloClusterExistingZooKeepersTest {
     FileUtils.deleteQuietly(testDir);
     assertTrue(testDir.mkdir());
 
+    // disable adminServer, which runs on port 8080 by default and we don't need
+    System.setProperty("zookeeper.admin.enableServer", "false");
     zooKeeper = new TestingServer();
 
     MiniAccumuloConfig config = new MiniAccumuloConfig(testDir, SECRET);
diff --git a/pom.xml b/pom.xml
index 5c2a4a1..e4b1d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <!-- bouncycastle version for test dependencies -->
     <bouncycastle.version>1.62</bouncycastle.version>
     <!-- Curator version -->
-    <curator.version>2.12.0</curator.version>
+    <curator.version>4.2.0</curator.version>
     <!-- relative path for Eclipse format; should override in child modules if necessary
-->
     <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
     <!-- extra release args for testing -->


Mime
View raw message