diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-08-19 15:01:58 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-08-19 15:01:58 +0200 |
commit | fa9cb345a17bcedfae450022d50cef687e4482c4 (patch) | |
tree | 58c5226c15124295357b6fe811ca9fb23416762c /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi | |
parent | a36f3ee1bedc1917e8ff1aeddcaa3b81f6dfe54e (diff) |
Abort running jobs less eagerly
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi')
2 files changed, 2 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index ebfd78c2764..8a182ce5eca 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -84,7 +84,6 @@ import java.io.File; import java.math.BigInteger; import java.net.URI; import java.security.cert.X509Certificate; -import java.time.Duration; import java.time.Instant; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json index 55be0881ec2..2813bd0ab7d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json @@ -413,7 +413,7 @@ "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-west-1/run/1", "start": "(ignore)", - "status": "aborted", + "status": "running", "versions": { "targetPlatform": "6.1.0", "targetApplication": { @@ -469,7 +469,7 @@ "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-east-3/run/2", "start": "(ignore)", - "status": "aborted", + "status": "running", "versions": { "targetPlatform": "6.1.0", "targetApplication": { |