diff options
| author | andreer <andreer@verizonmedia.com> | 2020-05-26 13:36:47 +0200 |
|---|---|---|
| committer | andreer <andreer@verizonmedia.com> | 2020-05-26 13:36:47 +0200 |
| commit | 675cd6fa400e7e43578aea0a59df08b8712e7ca6 (patch) | |
| tree | a714d124cc61bef9aabea196195d2d3834112ea0 /controller-server | |
| parent | 7cd4cbfe87388c094942a742cba9bf7d2d251623 (diff) | |
expect fewer SANs in test
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | 4 |
1 files changed, 3 insertions, 1 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 0ff14e01874..dfca2d69a5e 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 @@ -700,6 +700,8 @@ public class ControllerTest { // Create app1 var context1 = tester.newDeploymentContext("tenant1", "app1", "default"); var prodZone = ZoneId.from("prod", "us-west-1"); + var stagingZone = ZoneId.from("staging", "us-east-3"); + var testZone = ZoneId.from("test", "us-east-1"); tester.controllerTester().zoneRegistry().exclusiveRoutingIn(ZoneApiMock.from(prodZone)); var applicationPackage = new ApplicationPackageBuilder().athenzIdentity(AthenzDomain.from("domain"), AthenzService.from("service")) .compileVersion(RoutingController.DIRECT_ROUTING_MIN_VERSION) @@ -713,7 +715,7 @@ public class ControllerTest { assertEquals(Stream.concat(Stream.of("vznqtz7a5ygwjkbhhj7ymxvlrekgt4l6g.vespa.oath.cloud", "app1.tenant1.global.vespa.oath.cloud", "*.app1.tenant1.global.vespa.oath.cloud"), - tester.controller().zoneRegistry().zones().controllerUpgraded().ids().stream() + Stream.of(prodZone, testZone, stagingZone) .flatMap(zone -> Stream.of("", "*.") .map(prefix -> prefix + "app1.tenant1." + zone.region().value() + (zone.environment() == Environment.prod ? "" : "." + zone.environment().value()) + |