aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-01-10 18:35:11 +0100
committerjonmv <venstad@gmail.com>2023-01-10 18:35:11 +0100
commit3331e13fa38d66657c6f5a86650ff2ecadcffe1b (patch)
tree6d40af94a52b5c8ba9ad1b60f8d76c5aeab843ca /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
parent62ebb8ba050912f4f13d97f5ac4cf02e4c4c415f (diff)
Set newest revision as change for any instances it creates
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 13540246078..c3ba7cf1009 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -1371,52 +1371,52 @@ public class DeploymentTriggerTest {
app1.runJob(productionUsWest1);
tester.triggerJobs();
- assertEquals(2, tester.jobs().active().size());
+ assertEquals(3, tester.jobs().active().size());
app1.runJob(productionUsEast3);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
tester.clock().advance(Duration.ofHours(2));
app1.runJob(productionEuWest1);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app2.assertNotRunning(testEuWest1);
app2.runJob(productionEuWest1);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app2.runJob(testEuWest1);
tester.triggerJobs();
- assertEquals(List.of(), tester.jobs().active());
+ assertEquals(1, tester.jobs().active().size());
tester.clock().advance(Duration.ofHours(1));
app1.runJob(productionUsCentral1);
tester.triggerJobs();
- assertEquals(3, tester.jobs().active().size());
+ assertEquals(4, tester.jobs().active().size());
app1.runJob(testUsCentral1);
tester.triggerJobs();
- assertEquals(2, tester.jobs().active().size());
+ assertEquals(3, tester.jobs().active().size());
app1.runJob(productionApNortheast2);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app1.runJob(productionApNortheast1);
tester.triggerJobs();
- assertEquals(List.of(), tester.jobs().active());
+ assertEquals(1, tester.jobs().active().size());
tester.clock().advance(Duration.ofMinutes(30));
tester.triggerJobs();
- assertEquals(List.of(), tester.jobs().active());
+ assertEquals(1, tester.jobs().active().size());
tester.clock().advance(Duration.ofMinutes(30));
app1.runJob(testApNortheast1);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app1.runJob(testApNortheast2);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app1.runJob(testUsEast3);
tester.triggerJobs();
- assertEquals(1, tester.jobs().active().size());
+ assertEquals(2, tester.jobs().active().size());
app1.runJob(productionApSoutheast1);
tester.triggerJobs();
assertEquals(1, tester.jobs().active().size());