Some Curator clients require ensemble connect string

1 files changed, 2 insertions, 20 deletions

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 1899dcfe7cd..2fc4c2a7fc4 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.curator;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.net.HostName;
 import org.apache.curator.test.TestingServer;
 import org.junit.After;
 import org.junit.Before;
@@ -60,7 +59,7 @@ public class CuratorTest {
     public void require_that_curator_can_produce_spec() {
         try (Curator curator = createCurator(createTestConfig())) {
             assertThat(curator.connectionSpec(), is(spec1 + "," + spec2));
-            assertThat(curator.serverCount(), is(2));
+            assertThat(curator.zooKeeperEnsembleCount(), is(2));
         }
     }
 
@@ -69,27 +68,10 @@ public class CuratorTest {
         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
         builder.zookeeperserver(createZKBuilder("localhost", port1));
         try (Curator curator = createCurator(new ConfigserverConfig(builder))) {
-            assertThat(curator.serverCount(), is(1));
+            assertThat(curator.zooKeeperEnsembleCount(), is(1));
         }
     }
 
-    @Test
-    public void localhost_affinity() {
-        String localhostHostName = "myhost";
-        int localhostPort = 123;
-        String localhostSpec = localhostHostName + ":" + localhostPort;
-
-        ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
-        builder.zookeeperserver(createZKBuilder(localhostHostName, localhostPort));
-        builder.zookeeperserver(createZKBuilder("otherhost", 345));
-        builder.zookeeperLocalhostAffinity(true);
-        ConfigserverConfig config = new ConfigserverConfig(builder);
-
-        HostName.setHostNameForTestingOnly(localhostHostName);
-
-        assertThat(Curator.createConnectionSpec(config), is(localhostSpec));
-    }
-
     private ConfigserverConfig createTestConfig() {
         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
         builder.zookeeperserver(createZKBuilder("localhost", port1));