diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-14 18:02:30 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-15 13:22:23 +0200 |
commit | 50fe282683d3e17daabd4a513f93fd3de1c303e2 (patch) | |
tree | 2e66564df9646df9c5679fbcb1eb62457672763c /node-repository/src/test/java | |
parent | 7dd25b911e859fe609928bb9794444d2749ce0ba (diff) |
Refactor node-repository filters
Diffstat (limited to 'node-repository/src/test/java')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java index 924d38cc6c2..5043529507f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java @@ -185,7 +185,7 @@ public class RetiredExpirerTest { // Set wantToRetire on all 3 config servers List<Node> wantToRetireNodes = tester.nodeRepository().nodes() - .retire(NodeTypeFilter.from(NodeType.config, null), Agent.operator, Instant.now()); + .retire(NodeTypeFilter.from(NodeType.config), Agent.operator, Instant.now()); assertEquals(3, wantToRetireNodes.size()); // Redeploy to retire all 3 config servers diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index df101c416c1..f4333dfa0c3 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -271,7 +271,7 @@ public class ProvisioningTester { for (Node node : nodeRepository.nodes().list(Node.State.active).owner(application)) { int expectedRestarts = 0; for (HostFilter filter : filters) - if (NodeHostFilter.from(filter).matches(node)) + if (NodeHostFilter.from(filter).test(node)) expectedRestarts++; assertEquals(expectedRestarts, node.allocation().get().restartGeneration().wanted()); } |