summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-07-10 14:14:36 +0200
committerMartin Polden <mpolden@mpolden.no>2020-07-10 14:58:45 +0200
commit9f3a73ad7ae68d2f871cef34a280bc13ee0e72e9 (patch)
treebb54670680ad8efca9591c12fcf9d271fb073459 /controller-server/src/test/java/com/yahoo
parent9baa67e082830e31e47b2881737351cb1828d64f (diff)
Default to deploying proxy application in zones with shared routing
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index d5c26408b23..98412b8147b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -275,11 +275,12 @@ public class SystemUpgraderTest {
}
@Test
- public void does_not_deploy_proxy_app_in_zones_without_proxy() {
+ public void does_not_deploy_proxy_app_in_zone_without_shared_routing() {
var applications = List.of(SystemApplication.configServerHost, SystemApplication.configServer,
SystemApplication.tenantHost);
tester.configServer().bootstrap(List.of(zone1.getId()), applications);
tester.configServer().disallowConvergenceCheck(SystemApplication.proxy.id());
+ tester.zoneRegistry().exclusiveRoutingIn(zone1);
var systemUpgrader = systemUpgrader(UpgradePolicy.create().upgrade(zone1));
// System begins upgrade
@@ -382,8 +383,7 @@ public class SystemUpgraderTest {
private SystemUpgrader systemUpgrader(UpgradePolicy upgradePolicy) {
tester.zoneRegistry().setUpgradePolicy(upgradePolicy);
- return new SystemUpgrader(tester.controller(), Duration.ofDays(1)
- );
+ return new SystemUpgrader(tester.controller(), Duration.ofDays(1));
}
}