aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/test/java/com/yahoo/vespa/hosted/provision
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-11-27 11:40:25 +0100
committerMartin Polden <mpolden@mpolden.no>2023-11-27 11:40:25 +0100
commitbe1120996cd818755cf78b565a1bbe8bd33d8e50 (patch)
tree11aa07ea0d964886a7e4eb1e26752c53b48df539 /node-repository/src/test/java/com/yahoo/vespa/hosted/provision
parentc06e1680bfb1e480b3fdca5937eefe04e4ddfdc6 (diff)
Ensure that nodes do not change on bootstrap deployment
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java1
2 files changed, 2 insertions, 1 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 7e3a9d1ea88..6328e631daa 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
@@ -137,7 +137,7 @@ public class RebalancerTest {
@Test
public void testRebalancingDoesNotReduceSwitchExclusivity() {
- Capacity capacity = Capacity.from(new ClusterResources(4, 1, RebalancerTester.cpuResources), true, false);
+ Capacity capacity = Capacity.from(new ClusterResources(4, 1, RebalancerTester.cpuResources), true, true);
List<ApplicationContext> apps = List.of(new ApplicationContext(cpuApp, RebalancerTester.clusterSpec("c"), capacity));
RebalancerTester tester = new RebalancerTester(4, apps);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 8ba9fbdf6d2..5f2790e886a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -771,6 +771,7 @@ public class ProvisioningTest {
Capacity capacityCannotFail = Capacity.from(new ClusterResources(5, 1, defaultResources), false, false);
tester.activate(application, tester.prepare(application, cluster, capacityCannotFail));
+ assertEquals(0, tester.nodeRepository().nodes().list(Node.State.reserved).owner(application).size());
assertEquals(1, tester.nodeRepository().nodes().list(Node.State.active).owner(application).retired().size());
assertEquals(6, tester.nodeRepository().nodes().list(Node.State.active).owner(application).size());
}