summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2021-02-02 14:20:26 +0100
committerandreer <andreer@verizonmedia.com>2021-02-02 14:20:26 +0100
commit47ce7eca8c7dd8bbbf3e56f938a103bbc00af1a7 (patch)
tree9abc8824a14d4a3e1ed887e55c3e551cdb31613b /controller-server
parent2271c9814bd1a56fe599dad5c932f9c46ffbc75b (diff)
fix assumption in unit test
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java6
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 8fcbb365804..63452f40dbb 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
@@ -736,8 +736,8 @@ public class ControllerTest {
.map(prefix -> prefix + "app1.tenant1." + zone.region().value() +
(zone.environment() == Environment.prod ? "" : "." + zone.environment().value()) +
".vespa.oath.cloud")))
- .collect(Collectors.toUnmodifiableList()),
- tester.controllerTester().serviceRegistry().endpointCertificateMock().dnsNamesOf(context1.instanceId()));
+ .collect(Collectors.toUnmodifiableSet()),
+ Set.copyOf(tester.controllerTester().serviceRegistry().endpointCertificateMock().dnsNamesOf(context1.instanceId())));
// Next deployment reuses certificate
context1.submit(applicationPackage).deploy();
@@ -751,7 +751,7 @@ public class ControllerTest {
tester.controller().applications().deploy(context2.instanceId(), devZone, Optional.of(applicationPackage), DeployOptions.none());
assertTrue("Application deployed and activated",
tester.configServer().application(context2.instanceId(), devZone).get().activated());
- assertFalse("Does not provision certificate in zones with routing layer", certificate.apply(context2.instance()).isPresent());
+ assertTrue("Provisions certificate also in zone with routing layer", certificate.apply(context2.instance()).isPresent());
}
@Test