summaryrefslogtreecommitdiffstats
path: root/zookeeper-server
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-11-26 13:47:53 +0100
committerHarald Musum <musum@verizonmedia.com>2019-11-26 13:47:53 +0100
commit3a8e393bd0e05f708cd0b338f5b94ef1870509a9 (patch)
tree75ba3ee2aa3a78b71715d2dd6a8ce4679979fbdb /zookeeper-server
parent9ccb81b8acc58f17e52ee1738b0be78950968e9a (diff)
Fix tests
Diffstat (limited to 'zookeeper-server')
-rw-r--r--zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java
index f7467a2dbfe..8d491b35c0f 100644
--- a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java
+++ b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java
@@ -22,6 +22,7 @@ import java.security.KeyPair;
import java.security.cert.X509Certificate;
import java.util.Optional;
+import static com.yahoo.cloud.config.ZookeeperServerConfig.TlsForQuorumCommunication.Enum.OFF;
import static com.yahoo.cloud.config.ZookeeperServerConfig.TlsForQuorumCommunication.Enum.PORT_UNIFICATION;
import static com.yahoo.cloud.config.ZookeeperServerConfig.TlsForQuorumCommunication.Enum.TLS_ONLY;
import static com.yahoo.cloud.config.ZookeeperServerConfig.TlsForQuorumCommunication.Enum.TLS_WITH_PORT_UNIFICATION;
@@ -56,6 +57,7 @@ public class VespaZooKeeperServerImplTest {
@Test
public void config_is_written_correctly_when_one_server() throws IOException {
ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile);
+ builder.tlsForQuorumCommunication(OFF);
createServer(builder);
validateConfigFileSingleHost(cfgFile);
validateIdFile(idFile, "");
@@ -70,6 +72,7 @@ public class VespaZooKeeperServerImplTest {
builder.server(newServer(2, "baz", 345, 543));
builder.myidFile(idFile.getAbsolutePath());
builder.myid(1);
+ builder.tlsForQuorumCommunication(OFF);
createServer(builder);
validateConfigFileMultipleHosts(cfgFile);
validateIdFile(idFile, "1\n");
@@ -142,6 +145,7 @@ public class VespaZooKeeperServerImplTest {
builder.server(new ZookeeperServerConfig.Server.Builder().id(0).hostname("testhost"));
builder.zooKeeperConfigFile(cfgFile.getAbsolutePath());
builder.myidFile(idFile.getAbsolutePath());
+ builder.tlsForQuorumCommunication(OFF);
createServer(builder);
assertThat(System.getProperty(VespaZooKeeperServerImpl.ZOOKEEPER_JUTE_MAX_BUFFER), is("" + new ZookeeperServerConfig(builder).juteMaxBuffer()));