summaryrefslogtreecommitdiffstats
path: root/node-admin/src/test/java
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-11-15 09:25:05 +0100
committerValerij Fredriksen <valerijf@oath.com>2018-11-15 09:25:05 +0100
commit84176f942e3998c4a25464c88602d8b8ea52885c (patch)
treeee96e575d5674efbe2fde9bd11b573ce0c0e8190 /node-admin/src/test/java
parent5244925de4cd99d1bbb296c96db929a5d4b7e70f (diff)
Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations"
This reverts commit 9b6a78d
Diffstat (limited to 'node-admin/src/test/java')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java3
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index 99b3fde4eb1..d93d33617e3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -20,6 +20,7 @@ import org.mockito.InOrder;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.file.Paths;
+import java.util.Collections;
import java.util.Optional;
import java.util.OptionalLong;
@@ -39,7 +40,7 @@ public class DockerOperationsImplTest {
private final ProcessExecuter processExecuter = mock(ProcessExecuter.class);
private final IPAddresses ipAddresses = new IPAddressesMock();
private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl(
- docker, processExecuter, ipAddresses);
+ docker, processExecuter, Collections.emptyList(), ipAddresses);
@Test
public void processResultFromNodeProgramWhenSuccess() {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index b9592c9787d..9385e604142 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -29,6 +29,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Clock;
import java.time.Duration;
+import java.util.Collections;
import java.util.Optional;
import java.util.function.Function;
import java.util.logging.Logger;
@@ -89,7 +90,7 @@ public class DockerTester implements AutoCloseable {
Clock clock = Clock.systemUTC();
FileSystem fileSystem = TestFileSystem.create();
- DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, ipAddresses);
+ DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, Collections.emptyList(), ipAddresses);
MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
Function<String, NodeAgent> nodeAgentFactory = (hostName) -> new NodeAgentImpl(