diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-12-03 14:49:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-03 14:49:45 +0100 |
| commit | c7bb123f273952b8a35e01b2fb4861bc798b3b70 (patch) | |
| tree | c7769fd95b0e2de40e2718540a5572b5ecb8e7c4 /node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java | |
| parent | 3cb536b29949a27ab44db784ccc18a6b341b2505 (diff) | |
Revert "Bratseth/apply policies to limits"
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java')
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
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 95f25612dd7..db165aae919 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 @@ -523,7 +523,7 @@ public class ProvisioningTest { ApplicationId application = ProvisioningTester.applicationId(); tester.makeReadyHosts(10, defaultResources).activateTenantHosts(); - prepare(application, 1, 1, 1, 1, defaultResources, tester); + prepare(application, 1, 2, 3, 3, defaultResources, tester); } @Test @@ -1015,10 +1015,10 @@ public class ProvisioningTest { allHosts.addAll(content1); Function<Integer, Capacity> capacity = count -> Capacity.from(new ClusterResources(count, 1, NodeResources.unspecified()), required, true); - int expectedContainer0Size = tester.decideSize(capacity.apply(container0Size), application); - int expectedContainer1Size = tester.decideSize(capacity.apply(container1Size), application); - int expectedContent0Size = tester.decideSize(capacity.apply(content0Size), application); - int expectedContent1Size = tester.decideSize(capacity.apply(content1Size), application); + int expectedContainer0Size = tester.decideSize(container0Size, capacity.apply(container0Size), containerCluster0, application); + int expectedContainer1Size = tester.decideSize(container1Size, capacity.apply(container1Size), containerCluster1, application); + int expectedContent0Size = tester.decideSize(content0Size, capacity.apply(content0Size), contentCluster0, application); + int expectedContent1Size = tester.decideSize(content1Size, capacity.apply(content1Size), contentCluster1, application); assertEquals("Hosts in each group cluster is disjunct and the total number of unretired nodes is correct", expectedContainer0Size + expectedContainer1Size + expectedContent0Size + expectedContent1Size, |