aboutsummaryrefslogtreecommitdiffstats
path: root/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java')
-rw-r--r--zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java17
1 files changed, 1 insertions, 16 deletions
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 396555d5e3a..36205bdaca3 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/CuratorTest.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.zookeeper;
import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.net.HostName;
import com.yahoo.vespa.curator.Curator;
import org.apache.curator.test.TestingServer;
import org.junit.After;
@@ -12,8 +11,8 @@ import org.junit.Test;
import java.io.IOException;
import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
/**
* Sets up actual ZooKeeper servers and verifies we can talk to them.
@@ -75,20 +74,6 @@ public class CuratorTest {
}
}
- @Test
- public void require_that_server_order_is_correct() {
- 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(4));
- // host this is running on should come first
- assertTrue(curator.connectionSpec().startsWith(HostName.getLocalhost() + ":" + port2 + ",localhost:1234"));
- }
- }
-
private ConfigserverConfig createTestConfig() {
ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
builder.zookeeperserver(createZKBuilder("localhost", port1));