diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-11-30 15:44:41 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-11-30 15:44:41 +0100 |
commit | 25c1af6966af18e9fd5029bd5b0b0328f6dc1cc3 (patch) | |
tree | caf84e5d0e82a4c7ab6bbba811dafb3d01167e17 /controller-server | |
parent | daef832e7805139337eb6926d3c4b33cd5e0696d (diff) |
Update unit test
Diffstat (limited to 'controller-server')
3 files changed, 0 insertions, 14 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 8b8a7fc0c62..6e8445102c3 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 @@ -358,9 +358,6 @@ public class ApplicationApiTest extends ControllerContainerTest { ATHENZ_TENANT_DOMAIN_2, id2.application()); - // Trigger upgrade and then application change - deploymentTester.applications().deploymentTrigger().triggerChange(id2, Change.of(Version.fromString("7.0"))); - // POST an application package and a test jar, submitting a new application for production deployment. tester.assertResponse(request("/application/v4/tenant/tenant2/application/application2/submit", POST) .screwdriverIdentity(SCREWDRIVER_ID) @@ -389,11 +386,6 @@ public class ApplicationApiTest extends ControllerContainerTest { // GET application having both change and outstanding change tester.assertResponse(request("/application/v4/tenant/tenant2/application/application2", GET) - .userIdentity(USER_ID), - new File("application2.json")); - - // GET application having both change and outstanding change - tester.assertResponse(request("/application/v4/tenant/tenant2/application/application2", GET) .screwdriverIdentity(SCREWDRIVER_ID), new File("application2.json")); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json index 28732acb1df..df3f9699677 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json @@ -23,9 +23,6 @@ { "instance": "instance1", "deploying": { - "version": "7" - }, - "outstandingChange": { "revision": { "buildNumber": 1, "hash": "1.0.1-commit1", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json index d009af005e4..9ef46247629 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json @@ -22,9 +22,6 @@ { "instance": "instance1", "deploying": { - "version": "7" - }, - "outstandingChange": { "revision": { "buildNumber": 1, "hash": "1.0.1-commit1", |