Test explicitly that production jobs wait until both tests are done

1 files changed, 13 insertions, 6 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 63f71c925a3..3dcc16ccb88 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
@@ -73,16 +73,23 @@ public class DeploymentTriggerTest {
         tester.upgrader().maintain();
         tester.readyJobTrigger().maintain();
 
+        // staging-test times out and is retried
+        tester.buildService().remove(buildJob(app, stagingTest));
+        tester.readyJobTrigger().maintain();
+        assertEquals("Retried dead job", 2, tester.buildService().jobs().size());
+        tester.assertRunning(app.id(), stagingTest);
+        tester.deployAndNotify(app, applicationPackage, true, stagingTest);
+
+        // system-test is now the only running job -- production jobs haven't started yet, since it is unfinished.
+        tester.assertRunning(app.id(), systemTest);
+        assertEquals(1, tester.buildService().jobs().size());
+
         // system-test fails and is retried
         tester.deployAndNotify(app, applicationPackage, false, JobType.systemTest);
-        assertEquals("Job is retried on failure", 2, tester.buildService().jobs().size());
+        assertEquals("Job is retried on failure", 1, tester.buildService().jobs().size());
         tester.deployAndNotify(app, applicationPackage, true, JobType.systemTest);
 
-        // staging-test times out and is retried
-        tester.buildService().clear();
-        tester.readyJobTrigger().maintain();
-        assertEquals("Retried dead job", 1, tester.buildService().jobs().size());
-        assertEquals(JobType.stagingTest.jobName(), tester.buildService().jobs().get(0).jobName());
+        tester.assertRunning(app.id(), productionUsWest1);
     }
 
     @Test