diff options
Diffstat (limited to 'node-admin/src/test/java')
9 files changed, 9 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java index fe095cd0002..f7d16b5fc1d 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java @@ -39,6 +39,7 @@ public class MotdContainerDataTest { .environment("prod") .region("aws-us-east-1a") .defaultFlavor("cherry") + .cloud("mycloud") .build()); motdContainerData.writeTo((path, content) -> { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java index 4403b5bdad0..24ab35fc407 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java @@ -19,6 +19,7 @@ public class PromptContainerDataTest { .environment("prod") .region("aws-us-east-1a") .defaultFlavor("cherry") + .cloud("mycloud") .build()); promptContainerData.writeTo((path, content) -> { 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 81df3e52a21..357467122cb 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 @@ -35,6 +35,7 @@ public class DockerOperationsImplTest { .environment("prod") .system("main") .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); private final Docker docker = mock(Docker.class); private final ProcessExecuter processExecuter = mock(ProcessExecuter.class); 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 daf87422b9d..74c82296a5b 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 @@ -67,6 +67,7 @@ public class DockerTester implements AutoCloseable { .system("main") .pathResolver(new PathResolver(pathToVespaHome, Paths.get("/tmp"), Paths.get("/tmp"))) .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); Clock clock = Clock.systemUTC(); DockerOperations dockerOperations = new DockerOperationsImpl(dockerMock, environment, null, new IPAddressesImpl()); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java index b987150ea57..6dec010e972 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java @@ -16,7 +16,7 @@ import java.io.IOException; public class MultiDockerTest { @Test - public void test() throws InterruptedException, IOException { + public void test() throws InterruptedException { try (DockerTester dockerTester = new DockerTester()) { addAndWaitForNode(dockerTester, "host1.test.yahoo.com", new DockerImage("image1")); ContainerNodeSpec containerNodeSpec2 = addAndWaitForNode( diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java index d4eb327439a..4d4938a6f5d 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java @@ -103,6 +103,7 @@ public class FilebeatConfigProviderTest { .system(system) .logstashNodes(logstashNodes) .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java index f707b0f9f91..7de440ec4e7 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java @@ -42,6 +42,7 @@ public class StorageMaintainerTest { .system("main") .pathResolver(new PathResolver()) .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); private final DockerOperations docker = mock(DockerOperations.class); private final ProcessExecuter processExecuter = mock(ProcessExecuter.class); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index 45bb4bbf720..a88f417b821 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -53,7 +53,6 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -92,6 +91,7 @@ public class NodeAgentImplTest { .inetAddressResolver(new InetAddressResolver()) .pathResolver(pathResolver) .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); private final ContainerNodeSpec.Builder nodeSpecBuilder = new ContainerNodeSpec.Builder() @@ -302,7 +302,6 @@ public class NodeAgentImplTest { @Test public void failedNodeRunningContainerShouldStillBeRunning() { final long restartGeneration = 1; - final long rebootGeneration = 0; final ContainerNodeSpec nodeSpec = nodeSpecBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java index 83edd573260..d5afd74af66 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java @@ -24,6 +24,7 @@ public class EnvironmentTest { .system("main") .pathResolver(new PathResolver()) .defaultFlavor("d-2-8-50") + .cloud("mycloud") .build(); @Test |