diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-16 14:13:33 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-16 14:23:10 +0100 |
| commit | 91369adf8f525d96c2a03821a44e1487fdee2b22 (patch) | |
| tree | b912533cbf6bcaff2f7fb522622857b6e1b76d60 /node-admin/src/test/java | |
| parent | e768afe1c72d2ed165224f62f3f76012d6f09ede (diff) | |
Fail if IP address from node-repo does not match the resolved IP address if feature flag i set
Diffstat (limited to 'node-admin/src/test/java')
2 files changed, 3 insertions, 3 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 c40c25dbcc0..1c6a82d0bef 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 @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.docker; import com.google.common.net.InetAddresses; import com.yahoo.config.provision.DockerImage; -import com.yahoo.system.ProcessExecuter; +import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerName; import com.yahoo.vespa.hosted.dockerapi.Docker; @@ -37,7 +37,7 @@ public class DockerOperationsImplTest { private final TestTerminal terminal = new TestTerminal(); private final IPAddresses ipAddresses = new IPAddressesMock(); private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl( - docker, terminal, ipAddresses); + docker, terminal, ipAddresses, new InMemoryFlagSource()); @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 b64d3c8051e..653a6f7f091 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 @@ -87,7 +87,7 @@ public class DockerTester implements AutoCloseable { nodeRepository.updateNodeRepositoryNode(hostSpec); FileSystem fileSystem = TestFileSystem.create(); - DockerOperations dockerOperations = new DockerOperationsImpl(docker, terminal, ipAddresses); + DockerOperations dockerOperations = new DockerOperationsImpl(docker, terminal, ipAddresses, flagSource); Metrics metrics = new Metrics(); NodeAgentFactory nodeAgentFactory = (contextSupplier, nodeContext) -> new NodeAgentImpl( |