diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-09-09 13:56:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 13:56:24 +0200 |
| commit | 2e15c0183248f129a1fb92c5523b1211f1deb977 (patch) | |
| tree | 92720fbe7856e41cdadb045213da826dfa59bfa5 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | |
| parent | b737bed2ebbf14d9cb6778297efa9e56840a4214 (diff) | |
| parent | 6fe4ae1b13726ea5d6c674975039c473ae9d2ef6 (diff) | |
Merge pull request #10532 from vespa-engine/jvenstad/tester-app-with-cert
Jvenstad/tester app with cert
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 10f536498f2..6155191fb8f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -599,7 +599,7 @@ public class ControllerTest { tester.controller().applications().deploy(app.id(), zone, Optional.of(applicationPackage), options); assertTrue("Application deployed and activated", - tester.controllerTester().configServer().application(app.id()).get().activated()); + tester.controllerTester().configServer().application(app.id(), zone).get().activated()); assertTrue("No job status added", tester.applications().require(app.id()).deploymentJobs().jobStatus().isEmpty()); @@ -625,7 +625,7 @@ public class ControllerTest { // Deploy tester.controller().applications().deploy(app.id(), zone, Optional.of(applicationPackage), DeployOptions.none()); assertTrue("Application deployed and activated", - tester.controllerTester().configServer().application(app.id()).get().activated()); + tester.controllerTester().configServer().application(app.id(), zone).get().activated()); assertTrue("No job status added", tester.applications().require(app.id()).deploymentJobs().jobStatus().isEmpty()); assertEquals("DeploymentSpec is not persisted", DeploymentSpec.empty, tester.applications().require(app.id()).deploymentSpec()); @@ -721,7 +721,7 @@ public class ControllerTest { // Deploy app2 in dev tester.controller().applications().deploy(app2.id(), zone, Optional.of(applicationPackage), DeployOptions.none()); assertTrue("Application deployed and activated", - tester.controllerTester().configServer().application(app2.id()).get().activated()); + tester.controllerTester().configServer().application(app2.id(), zone).get().activated()); assertFalse("Does not provision certificate in " + Environment.dev, certificate.apply(app2).isPresent()); } |