Test with more servers in list

2 files changed, 7 insertions, 4 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 2d9d07ed512..a9d099fea31 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -87,7 +87,8 @@ public class Curator implements AutoCloseable {
                 indexForThisConfigServer = i;
         }
         // Rotate list of servers so that config server on this host is first in the list
-        Collections.rotate(servers, configServerCount - indexForThisConfigServer);
+        if (indexForThisConfigServer != 0)
+            Collections.rotate(servers, configServerCount - indexForThisConfigServer);
         return servers;
     }
 
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
index fb747df9021..396555d5e3a 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
@@ -12,8 +12,8 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Sets up actual ZooKeeper servers and verifies we can talk to them.
@@ -80,10 +80,12 @@ public class CuratorTest {
         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
         builder.zookeeperserver(createZKBuilder("localhost", port1));
         builder.zookeeperserver(createZKBuilder(HostName.getLocalhost(), port2));
+        builder.zookeeperserver(createZKBuilder("localhost", 1234));
+        builder.zookeeperserver(createZKBuilder("localhost", 6789));
         try (Curator curator = createCurator(new ConfigserverConfig(builder))) {
-            assertThat(curator.serverCount(), is(2));
+            assertThat(curator.serverCount(), is(4));
             // host this is running on should come first
-            assertEquals(HostName.getLocalhost() + ":" + port2 + ",localhost:" + port1, curator.connectionSpec());
+            assertTrue(curator.connectionSpec().startsWith(HostName.getLocalhost() + ":" + port2 + ",localhost:1234"));
         }
     }