diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-23 14:35:03 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-23 14:35:03 +0200 |
| commit | 34c4932d15693496ec53d6dd77dfbe2e989e3943 (patch) | |
| tree | a7a312573d666ac1a153da634e7be0a351face10 /controller-server/src/test/java | |
| parent | 39c819c409776fe21c370a33773f57b034d90961 (diff) | |
Avoid uncontrollable multi-threaded execution in unit test
Diffstat (limited to 'controller-server/src/test/java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java | 6 |
1 files changed, 1 insertions, 5 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 4ec075c3c16..a12a2b5e57a 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 @@ -133,6 +133,7 @@ public class ApplicationApiTest extends ControllerContainerTest { @Test public void testApplicationApi() { tester.computeVersionStatus(); + tester.controller().jobController().setRunner(__ -> { }); // Avoid uncontrollable, multi-threaded job execution createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID); // (Necessary but not provided in this API) @@ -658,11 +659,6 @@ public class ApplicationApiTest extends ControllerContainerTest { .screwdriverIdentity(SCREWDRIVER_ID), "{\"message\":\"Successfully copied environment hosted-instance_tenant1_application1_placeholder_component_default to hosted-instance_tenant1_application1_us-west-1_prod_default\"}"); - // DELETE the deployment to dev - tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-east-1/instance/default", DELETE) - .userIdentity(USER_ID), - "Deactivated tenant/tenant1/application/application1/environment/dev/region/us-east-1/instance/default"); - // DELETE an application tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", DELETE).userIdentity(USER_ID) .oktaAccessToken(OKTA_AT), |