Add constructor without ZooKeeperServer argument, for testing

Will be used by code in internal repo, so needs to be public

2 files changed, 6 insertions, 1 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index a543d43abcd..dc51c82b5e6 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -64,6 +64,11 @@ public class Curator implements AutoCloseable {
         return new Curator(connectionSpec, connectionSpec);
     }
 
+    // For testing
+    public Curator(ConfigserverConfig configserverConfig) {
+        this(configserverConfig, createConnectionSpec(configserverConfig));
+    }
+
     // Depend on ZooKeeperServer to make sure it is started first
     // TODO: Move zookeeperserver config out of configserverconfig (requires update of controller services.xml as well)
     @Inject
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
index 566df91dfb0..a8342dfe5bc 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -99,7 +99,7 @@ public class CuratorTest {
     }
 
     private Curator createCurator(ConfigserverConfig configserverConfig) {
-        return new Curator(configserverConfig, null);
+        return new Curator(configserverConfig);
     }
 
     private static class PortAllocator {