diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2022-03-10 19:19:19 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2022-03-10 19:19:19 +0100 |
| commit | c07cdf3709e0d8ed6e5266247c25010ba04468f8 (patch) | |
| tree | e1d53734d0cf5d0a41fcb7894512aacd16a94e63 /node-admin/src/test | |
| parent | 9ecddda1e37238420a0b1fe65ba701fdf79283cb (diff) | |
Non-functional changes
Diffstat (limited to 'node-admin/src/test')
3 files changed, 4 insertions, 7 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/MultiContainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/MultiContainerTest.java index de769d6a2d0..5bb279323e9 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/MultiContainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/MultiContainerTest.java @@ -25,8 +25,7 @@ public class MultiContainerTest { DockerImage image2 = DockerImage.fromString("registry.example.com/image2"); try (ContainerTester tester = new ContainerTester(List.of(image1, image2))) { addAndWaitForNode(tester, "host1.test.yahoo.com", image1); - NodeSpec nodeSpec2 = addAndWaitForNode( - tester, "host2.test.yahoo.com", image2); + NodeSpec nodeSpec2 = addAndWaitForNode(tester, "host2.test.yahoo.com", image2); tester.addChildNodeRepositoryNode(NodeSpec.Builder.testSpec(nodeSpec2.hostname(), NodeState.dirty).build()); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java index aec9336c13c..4d95991dd29 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java @@ -33,9 +33,7 @@ public class RebootTest { ContainerName host1 = new ContainerName("host1"); tester.inOrder(tester.containerOperations).createContainer(containerMatcher(host1), any(), any()); - try { - tester.setWantedState(NodeAdminStateUpdater.State.SUSPENDED); - } catch (RuntimeException ignored) { } + tester.setWantedState(NodeAdminStateUpdater.State.SUSPENDED); tester.inOrder(tester.orchestrator).suspend( eq(HOST_HOSTNAME.value()), eq(List.of(hostname, HOST_HOSTNAME.value()))); 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 d87a60e4a44..28ef19d4065 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 @@ -784,8 +784,8 @@ public class NodeAgentImplTest { return new NodeAgentImpl(contextSupplier, nodeRepository, orchestrator, containerOperations, () -> RegistryCredentials.none, storageMaintainer, flagSource, - List.of(credentialsMaintainer), Optional.of(aclMaintainer), - Optional.of(healthChecker), clock, warmUpDuration, VespaServiceDumper.DUMMY_INSTANCE); + List.of(credentialsMaintainer), Optional.of(aclMaintainer), Optional.of(healthChecker), + clock, warmUpDuration, VespaServiceDumper.DUMMY_INSTANCE); } private void mockGetContainer(DockerImage dockerImage, boolean isRunning) { |