Be smarter about guessing future deployed versions for eager tests

1 files changed, 13 insertions, 2 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 8830475fd16..805d727d355 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
@@ -285,11 +285,21 @@ public class DeploymentTriggerTest {
         assertEquals(revision4, app.deploymentStatus().outstandingChange(InstanceName.defaultName()).application());
 
         // The third revision fails, and the fourth is chosen to replace it.
-        app.triggerJobs().jobAborted(stagingTest).timeOutConvergence(systemTest);
+        app.triggerJobs().timeOutConvergence(systemTest);
         tester.outstandingChangeDeployer().run();
         tester.outstandingChangeDeployer().run();
         assertEquals(revision4, app.instance().change().application());
         assertEquals(revision5, app.deploymentStatus().outstandingChange(InstanceName.defaultName()).application());
+
+        // Tests for outstanding change are relevant when current revision completes.
+        app.runJob(systemTest).runJob(systemTest)
+           .jobAborted(stagingTest).runJob(stagingTest).runJob(stagingTest)
+           .runJob(productionUsEast3);
+        tester.outstandingChangeDeployer().run();
+        tester.outstandingChangeDeployer().run();
+        assertEquals(revision5, app.instance().change().application());
+        assertEquals(Change.empty(), app.deploymentStatus().outstandingChange(InstanceName.defaultName()));
+        app.runJob(productionUsEast3);
     }
 
     @Test
@@ -1827,7 +1837,8 @@ public class DeploymentTriggerTest {
         // System and staging tests both require unknown versions, and are broken.
         tester.controller().applications().deploymentTrigger().forceTrigger(app.instanceId(), productionCdUsEast1, "user", false);
         app.runJob(productionCdUsEast1)
-           .abortJob(systemTest)
+           .triggerJobs()
+           .jobAborted(systemTest)
            .jobAborted(stagingTest)
            .runJob(systemTest)  // Run test for aws zone again.
            .runJob(stagingTest) // Run test for aws zone again.