diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 10:27:02 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 10:27:02 +0200 |
commit | dd00488eb36a83a849a252bc33e7826d7030895c (patch) | |
tree | a060294eb5088f767fdc8422c2cace82d0eeca15 /node-repository | |
parent | 747e20cef209add11f282e77081b7b1da81ddf29 (diff) |
Fix test
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java index f6db9a45a61..edc83c2c74e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java @@ -89,12 +89,13 @@ public class RebalancerTest { tester.nodeRepository().nodes().deactivate(List.of(cpuSkewedNode), new ApplicationTransaction(new ProvisionLock(cpuApp, () -> {}), tx)); tx.commit(); + assertEquals(1, tester.getNodes(Node.State.dirty).size()); // ... if activation fails when trying, we clean up the state tester.deployer().setFailActivate(true); tester.maintain(); assertTrue("Want to retire is reset", tester.getNodes(Node.State.active).stream().noneMatch(node -> node.status().wantToRetire())); - assertEquals("Reserved node was moved to dirty", 1, tester.getNodes(Node.State.dirty).size()); + assertEquals("Reserved node was moved to dirty", 2, tester.getNodes(Node.State.dirty).size()); String reservedHostname = tester.getNodes(Node.State.dirty).first().get().hostname(); tester.nodeRepository().nodes().setReady(reservedHostname, Agent.system, "Cleanup"); tester.nodeRepository().nodes().removeRecursively(reservedHostname); @@ -163,12 +164,12 @@ public class RebalancerTest { static class RebalancerTester { - static ApplicationId cpuApp = makeApplicationId("t1", "a1"); - static ApplicationId memoryApp = makeApplicationId("t2", "a2"); - private static NodeResources cpuResources = new NodeResources(8, 4, 10, 0.1); - private static NodeResources memResources = new NodeResources(4, 9, 10, 0.1); - private TestMetric metric = new TestMetric(); - private ProvisioningTester tester = new ProvisioningTester.Builder() + static final ApplicationId cpuApp = makeApplicationId("t1", "a1"); + static final ApplicationId memoryApp = makeApplicationId("t2", "a2"); + private static final NodeResources cpuResources = new NodeResources(8, 4, 10, 0.1); + private static final NodeResources memResources = new NodeResources(4, 9, 10, 0.1); + private final TestMetric metric = new TestMetric(); + private final ProvisioningTester tester = new ProvisioningTester.Builder() .zone(new Zone(Environment.perf, RegionName.from("us-east"))) .flavorsConfig(flavorsConfig()) .build(); |