diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-01-12 09:08:28 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-01-12 09:08:28 +0100 |
| commit | a15870df6407b7e4ae39fe48039616027d6ae85c (patch) | |
| tree | 94373588da393f6071d199312f6e26dd4a9710ca /controller-server/src | |
| parent | e3c842c8f7271126cb9e869937da907c4ddfd312 (diff) | |
Test delete application with active deployments
Diffstat (limited to 'controller-server/src')
2 files changed, 9 insertions, 0 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 f48f6b02bd2..1e594c8b5ea 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 @@ -269,6 +269,11 @@ public class ApplicationApiTest extends ControllerContainerTest { // GET service tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/corp-us-east-1/instance/default/service/storagenode-awe3slno6mmq2fye191y324jl/state/v1/", GET), new File("service.json")); + + // DELETE application with active deployments fails + tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", DELETE).userIdentity(USER_ID), + new File("delete-with-active-deployments.json"), 400); + // DELETE (deactivate) a deployment - dev tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/default", DELETE), "Deactivated tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/default"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/delete-with-active-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/delete-with-active-deployments.json new file mode 100644 index 00000000000..f85ac6dbf8b --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/delete-with-active-deployments.json @@ -0,0 +1,4 @@ +{ + "error-code": "BAD_REQUEST", + "message": "Could not delete 'application 'tenant1.application1'': It has active deployments" +} |