diff options
Diffstat (limited to 'node-repository/src/test/java')
4 files changed, 7 insertions, 6 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java index 98a3020e38e..77a6ff675c4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java @@ -33,7 +33,7 @@ public class NodeRepositoryTest { assertEquals(3, tester.nodeRepository().getNodes().size()); - tester.nodeRepository().park("host2", Agent.system, "Parking to unit test"); + tester.nodeRepository().park("host2", true, Agent.system, "Parking to unit test"); tester.nodeRepository().removeRecursively("host2"); assertEquals(2, tester.nodeRepository().getNodes().size()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java index 6eeeb3dfe08..399ff8582bd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java @@ -159,7 +159,7 @@ public class NodeRetirerTest { // Now 2 of those finish retiring and go to parked nodesToRetire.stream().limit(2).forEach(node -> - tester.nodeRepository.park(node.hostname(), Agent.system, "Parked for unit testing")); + tester.nodeRepository.park(node.hostname(), false, Agent.system, "Parked for unit testing")); long actualOneRetired = retirer.getNumberNodesAllowToRetireForCluster(tester.nodeRepository.getNodes(app), 2); assertEquals(1, actualOneRetired); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java index 64613f1bf56..5e33e863df7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.LongStream; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -163,9 +164,9 @@ public class NodeRetirerTester { } void assertParkedCountsByApplication(long... nums) { - Map<ApplicationId, Long> expected = expectedCountsByApplication(nums); - Map<ApplicationId, Long> actual = nodeRepository.getNodes(Node.State.parked).stream() - .collect(Collectors.groupingBy(node -> node.allocation().get().owner(), Collectors.counting())); + // Nodes lose allocation when parked, so just do a sum. + long expected = LongStream.of(nums).filter(value -> value > 0L).sum(); + long actual = (long) nodeRepository.getNodes(Node.State.parked).size(); assertEquals(expected, actual); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java index 8a10c0207b4..67fa610e2e0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java @@ -89,7 +89,7 @@ public class PeriodicApplicationMaintainerTest { // Fail and park some nodes nodeRepository.fail(nodeRepository.getNodes(fixture.app1).get(3).hostname(), Agent.system, "Failing to unit test"); nodeRepository.fail(nodeRepository.getNodes(fixture.app2).get(0).hostname(), Agent.system, "Failing to unit test"); - nodeRepository.park(nodeRepository.getNodes(fixture.app2).get(4).hostname(), Agent.system, "Parking to unit test"); + nodeRepository.park(nodeRepository.getNodes(fixture.app2).get(4).hostname(), true, Agent.system, "Parking to unit test"); int failedInApp1 = 1; int failedOrParkedInApp2 = 2; assertEquals(fixture.wantedNodesApp1 - failedInApp1, nodeRepository.getNodes(fixture.app1, Node.State.active).size()); |