diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-01-09 16:56:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 16:56:50 +0100 |
| commit | 5900c30d04a4b56b7e47e0c149b2542a5101b433 (patch) | |
| tree | e499b3a936fdb1279c858c3350fd62943120968c /node-repository/src/test/java | |
| parent | 14ef98ae75260ce6e42e282b89c1dc4a97d659aa (diff) | |
| parent | 6ace72518ea9b56b8192c13ec732047029f8e717 (diff) | |
Merge pull request #25464 from vespa-engine/hakonhall/patch-wanttodeprovision-recursively
Patch wantToDeprovision recursively
Diffstat (limited to 'node-repository/src/test/java')
2 files changed, 4 insertions, 5 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java index 32886733856..359f75c27ab 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java @@ -37,12 +37,12 @@ public class ProvisionedExpirerTest { tester.clock().advance(Duration.ofMinutes(5)); new ProvisionedExpirer(tester.nodeRepository(), Duration.ofMinutes(4), new TestMetric()).maintain(); - assertEquals(5, tester.nodeRepository().nodes().list().deprovisioning().size()); - assertEquals(20, tester.nodeRepository().nodes().list().not().deprovisioning().size()); + assertEquals(10, tester.nodeRepository().nodes().list().deprovisioning().size()); + assertEquals(5, tester.nodeRepository().nodes().list().not().deprovisioning().size()); } private void populateNodeRepo() { - var nodes = IntStream.range(0, 25) + var nodes = IntStream.range(0, 15) .mapToObj(i -> Node.create("id-" + i, "host-" + i, new Flavor(NodeResources.unspecified()), Node.State.provisioned, NodeType.host).build()) .toList(); tester.nodeRepository().database().addNodesInState(nodes, Node.State.provisioned, Agent.system); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index 55b401ef4e8..f5fe0e6aafd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -218,9 +218,8 @@ public class NodesV2ApiTest { assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost2.yahoo.com", Utf8.toBytes("{\"wantToDeprovision\": true, \"wantToRetire\": true}"), Request.Method.PATCH), "{\"message\":\"Updated dockerhost2.yahoo.com\"}"); - // Make sure that wantToRetire is applied recursively, but wantToDeprovision isn't tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com"), - "\"wantToRetire\":true,\"preferToRetire\":false,\"wantToDeprovision\":false,"); + "\"wantToRetire\":true,\"preferToRetire\":false,\"wantToDeprovision\":true,"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com", Utf8.toBytes("{\"wantToRebuild\": true, \"wantToRetire\": true}"), Request.Method.PATCH), "{\"message\":\"Updated dockerhost1.yahoo.com\"}"); |