diff options
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java index 065b039c7fd..2431433b17f 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.nodeadmin; import com.yahoo.metrics.simple.MetricReceiver; import com.yahoo.test.ManualClock; import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper; -import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgent; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentImpl; import org.junit.Test; @@ -37,12 +36,11 @@ import static org.mockito.Mockito.when; public class NodeAdminImplTest { // Trick to allow mocking of typed interface without casts/warnings. private interface NodeAgentFactory extends Function<String, NodeAgent> {} - private final DockerOperations dockerOperations = mock(DockerOperations.class); private final Function<String, NodeAgent> nodeAgentFactory = mock(NodeAgentFactory.class); private final Runnable aclMaintainer = mock(Runnable.class); private final ManualClock clock = new ManualClock(); - private final NodeAdminImpl nodeAdmin = new NodeAdminImpl(dockerOperations, nodeAgentFactory, aclMaintainer, + private final NodeAdminImpl nodeAdmin = new NodeAdminImpl(nodeAgentFactory, aclMaintainer, new MetricReceiverWrapper(MetricReceiver.nullImplementation), clock); @Test @@ -53,7 +51,6 @@ public class NodeAdminImplTest { final NodeAgent nodeAgent2 = mock(NodeAgentImpl.class); when(nodeAgentFactory.apply(eq(hostName1))).thenReturn(nodeAgent1); when(nodeAgentFactory.apply(eq(hostName2))).thenReturn(nodeAgent2); - when(dockerOperations.getAllManagedContainers()).thenReturn(Collections.emptyList()); final InOrder inOrder = inOrder(nodeAgentFactory, nodeAgent1, nodeAgent2); @@ -91,8 +88,6 @@ public class NodeAdminImplTest { @Test public void testSetFrozen() { - when(dockerOperations.getAllManagedContainers()).thenReturn(Collections.emptyList()); - List<NodeAgent> nodeAgents = new ArrayList<>(); Set<String> existingContainerHostnames = new HashSet<>(); for (int i = 0; i < 3; i++) { |