summaryrefslogtreecommitdiffstats
path: root/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
index f2d5c7e3ade..e1501cf59fe 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
@@ -32,18 +32,20 @@ import static org.mockito.Mockito.when;
/**
* Basic test of NodeAdminStateUpdater
+ *
* @author freva
*/
public class NodeAdminStateUpdaterTest {
- private final String parentHostname = "basehost1.test.yahoo.com";
-
- private final ManualClock clock = new ManualClock();
private final NodeRepository nodeRepository = mock(NodeRepository.class);
- private final NodeAdmin nodeAdmin = mock(NodeAdmin.class);
- private final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class);
private final Orchestrator orchestrator = mock(Orchestrator.class);
+ private final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class);
+ private final NodeAdmin nodeAdmin = mock(NodeAdmin.class);
+ private final String parentHostname = "basehost1.test.yahoo.com";
+ private final ManualClock clock = new ManualClock();
+ private final Duration convergeStateInterval = Duration.ofSeconds(30);
+
private final NodeAdminStateUpdater refresher = spy(new NodeAdminStateUpdater(
- nodeRepository, nodeAdmin, storageMaintainer, clock, orchestrator, parentHostname));
+ nodeRepository, orchestrator, storageMaintainer, nodeAdmin, parentHostname, clock, convergeStateInterval));
@Test
@@ -66,7 +68,7 @@ public class NodeAdminStateUpdaterTest {
List<String> suspendHostnames = new ArrayList<>(activeHostnames);
suspendHostnames.add(parentHostname);
- when(nodeRepository.getContainersToRun()).thenReturn(containersToRun);
+ when(nodeRepository.getContainersToRun(eq(parentHostname))).thenReturn(containersToRun);
// Initially everything is frozen to force convergence
assertFalse(refresher.setResumeStateAndCheckIfResumed(NodeAdminStateUpdater.State.RESUMED));