diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-11 11:01:42 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-11 11:01:42 +0100 |
| commit | e8ec6b51dcf52fcbf893eb2c1dbc0206e80a28ef (patch) | |
| tree | 58fda12aa0f554c0dd2eaf8db12e4fe937d587f9 /controller-server | |
| parent | 988e36ba7ab840e21e19e593e628f5721bb30cbb (diff) | |
Add unit test for pin manipulation (unrelated)
Diffstat (limited to 'controller-server')
5 files changed, 20 insertions, 8 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 5f17ea1c5c6..fd3b30a76c9 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 @@ -361,24 +361,40 @@ public class ApplicationApiTest extends ControllerContainerTest { // DELETE (cancel) ongoing change tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying", DELETE) .userIdentity(HOSTED_VESPA_OPERATOR), - new File("application-deployment-cancelled.json")); + "{\"message\":\"Changed deployment from 'application change to 1.0.42-commit1' to 'no change' for application 'tenant1.application1'\"}"); // DELETE (cancel) again is a no-op tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying", DELETE) .userIdentity(USER_ID) .data("{\"cancel\":\"all\"}"), - new File("application-deployment-cancelled-no-op.json")); + "{\"message\":\"No deployment in progress for application 'tenant1.application1' at this time\"}"); // POST pinning to a given version to an application tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying/pin", POST) .userIdentity(USER_ID) .data("6.1.0"), - new File("application-deployment.json")); + "{\"message\":\"Triggered pin to 6.1 for tenant1.application1\"}"); // DELETE only the pin to a given version tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying/pin", DELETE) .userIdentity(USER_ID), - new File("application-pin-cancelled.json")); + "{\"message\":\"Changed deployment from 'pin to 6.1' to 'upgrade to 6.1' for application 'tenant1.application1'\"}"); + + // POST pinning to a different version to an application + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying/pin", POST) + .userIdentity(USER_ID) + .data("6.240.0"), + "{\"message\":\"Triggered pin to 6.240 for tenant1.application1\"}"); + + // DELETE only the version, but leave the pin + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying/platform", DELETE) + .userIdentity(USER_ID), + "{\"message\":\"Changed deployment from 'pin to 6.240' to 'pin to current platform' for application 'tenant1.application1'\"}"); + + // DELETE also the pin to a given version + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying/pin", DELETE) + .userIdentity(USER_ID), + "{\"message\":\"Changed deployment from 'pin to current platform' to 'no change' for application 'tenant1.application1'\"}"); // POST a pause to a production job tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/default/job/production-us-west-1/pause", POST) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled-no-op.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled-no-op.json deleted file mode 100644 index 91d3e64d6db..00000000000 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled-no-op.json +++ /dev/null @@ -1 +0,0 @@ -{"message":"No deployment in progress for application 'tenant1.application1' at this time"} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json deleted file mode 100644 index efca5831256..00000000000 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json +++ /dev/null @@ -1 +0,0 @@ -{"message":"Changed deployment from 'application change to 1.0.42-commit1' to 'no change' for application 'tenant1.application1'"} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment.json deleted file mode 100644 index fe68f3d94a3..00000000000 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment.json +++ /dev/null @@ -1 +0,0 @@ -{"message":"Triggered pin to 6.1 for tenant1.application1"}
\ No newline at end of file diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-pin-cancelled.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-pin-cancelled.json deleted file mode 100644 index 62360458ce4..00000000000 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-pin-cancelled.json +++ /dev/null @@ -1 +0,0 @@ -{"message":"Changed deployment from 'pin to 6.1' to 'upgrade to 6.1' for application 'tenant1.application1'"} |