aboutsummaryrefslogtreecommitdiffstats
path: root/zkfacade/src/test/java/com
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-01-09 16:56:51 +0100
committerHarald Musum <musum@verizonmedia.com>2020-01-09 16:56:51 +0100
commit63c151e0ebb65221dc318b4191db063e4da0cef4 (patch)
treed278278d44f5d5697a8baac9260f65d2c25a4e19 /zkfacade/src/test/java/com
parent011a262844a16db4524a1879cd9f893c78509ff1 (diff)
Create zookeeper client config file only when necessary
Diffstat (limited to 'zkfacade/src/test/java/com')
-rw-r--r--zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java9
1 files changed, 4 insertions, 5 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 4cd2c708d1a..d428540f8c1 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -9,7 +9,6 @@ import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
-import java.nio.file.Files;
import java.util.Optional;
import static org.hamcrest.core.Is.is;
@@ -54,7 +53,7 @@ public class CuratorTest {
}
@Test
- public void require_curator_is_created_from_config() throws IOException {
+ public void require_curator_is_created_from_config() {
try (Curator curator = createCurator(createTestConfig())) {
assertThat(curator.zooKeeperEnsembleConnectionSpec(), is(spec1 + "," + spec2));
assertThat(curator.zooKeeperEnsembleCount(), is(2));
@@ -62,7 +61,7 @@ public class CuratorTest {
}
@Test
- public void require_that_server_count_is_correct() throws IOException {
+ public void require_that_server_count_is_correct() {
ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
builder.zookeeperserver(createZKBuilder(localhost, port1));
try (Curator curator = createCurator(new ConfigserverConfig(builder))) {
@@ -100,8 +99,8 @@ public class CuratorTest {
return zkBuilder;
}
- private Curator createCurator(ConfigserverConfig configserverConfig) throws IOException {
- return new Curator(configserverConfig, Optional.of(Files.createTempFile("zookeeper-client", "cfg").toFile()));
+ private Curator createCurator(ConfigserverConfig configserverConfig) {
+ return new Curator(configserverConfig, Optional.empty());
}
private static class PortAllocator {