diff options
Diffstat (limited to 'controller-server/src/test/java')
2 files changed, 12 insertions, 36 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java index 6067322f2b6..dd2267be3a4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java @@ -259,7 +259,7 @@ public class DeploymentContext { /** Trigger all outstanding jobs, if any */ public DeploymentContext triggerJobs() { - while (tester.controller().applications().deploymentTrigger().triggerReadyJobs() > 0); + tester.triggerJobs(); return this; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json index 4f544427c4d..d0d79903da5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json @@ -40,17 +40,14 @@ "jobs": [ { "name": "system-test", - "coolingDownUntil": "(ignore)", - "pending": "platform" + "coolingDownUntil": "(ignore)" }, { "name": "staging-test", - "coolingDownUntil": "(ignore)", - "pending": "platform" + "coolingDownUntil": "(ignore)" }, { - "name": "production-us-west-1", - "pending": "platform" + "name": "production-us-west-1" } ], "allRuns": { @@ -82,16 +79,13 @@ "upgradePolicy": "default", "jobs": [ { - "name": "system-test", - "pending": "platform" + "name": "system-test" }, { - "name": "staging-test", - "pending": "platform" + "name": "staging-test" }, { - "name": "production-us-west-1", - "pending": "platform" + "name": "production-us-west-1" } ], "allRuns": { @@ -279,11 +273,11 @@ { "name": "system-test", "coolingDownUntil": "(ignore)", - "pending": "application" + "pending": "platform" }, { "name": "staging-test", - "pending": "application" + "pending": "platform" }, { "name": "production-us-west-1", @@ -336,12 +330,10 @@ "upgradePolicy": "default", "jobs": [ { - "name": "system-test", - "pending": "platform" + "name": "system-test" }, { - "name": "staging-test", - "pending": "platform" + "name": "staging-test" }, { "name": "production-us-west-1", @@ -355,20 +347,6 @@ "start": "(ignore)", "status": "running" } - }, - "system-test": { - "running": { - "number": 1, - "start": "(ignore)", - "status": "running" - } - }, - "staging-test": { - "running": { - "number": 1, - "start": "(ignore)", - "status": "running" - } } }, "upgradeRuns": { @@ -378,9 +356,7 @@ "start": "(ignore)", "status": "running" } - }, - "system-test": {}, - "staging-test": {} + } } } ] |