diff options
author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-08-27 10:05:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 10:05:53 +0200 |
commit | a6441b5c9ac6cdb89aafe8d62bbf6222dd7d8dd0 (patch) | |
tree | 54cf633f84cba9ff38fcabcef407e5b08b0ccc58 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | |
parent | 51593be34396d641219550017282f6e41403a809 (diff) | |
parent | 67135e7405b1576ab06f79e9f9f4856281fbc1be (diff) |
Merge pull request #10422 from vespa-engine/revert-10419-revert-10414-andreer/only-provision-cert-for-directly-routed-zones
Revert "Revert "provision certificates for directly routed zones""
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 | 4 |
1 files changed, 2 insertions, 2 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 0d2d9ae68bd..210b94737b0 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 @@ -696,7 +696,7 @@ public class ControllerTest { } @Test - public void testDeployProvisionsCertificate() { + public void testDeploySelectivelyProvisionsCertificate() { ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.PROVISION_APPLICATION_CERTIFICATE.id(), true); Function<Application, Optional<ApplicationCertificate>> certificate = (application) -> tester.controller().curator().readApplicationCertificate(application.id()); @@ -722,7 +722,7 @@ public class ControllerTest { 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()); - assertTrue("Provisions certificate in " + Environment.dev, certificate.apply(app2).isPresent()); + assertFalse("Does not provision certificate in " + Environment.dev, certificate.apply(app2).isPresent()); } @Test |