diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-11 13:39:31 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-11 13:39:31 +0100 |
| commit | 9c357854f8945738dd513d6fe7b598c81cda9e77 (patch) | |
| tree | 65ef0c29b2cd1b565f3717e8935d28e062b210fa /controller-server | |
| parent | 2141b8d758e3b524bcf93aab742c508678d4a85c (diff) | |
More Zone -> ZoneId
Diffstat (limited to 'controller-server')
| -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 68cc7ed20fe..8af95f6b612 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 @@ -650,8 +650,8 @@ public class ControllerTest { .build(); tester.notifyJobCompletion(component, app1, true); tester.deployAndNotify(app1, applicationPackage, true, systemTest); - tester.applications().deactivate(app1, new Zone(Environment.test, RegionName.from("us-east-1"))); - tester.applications().deactivate(app1, new Zone(Environment.staging, RegionName.from("us-east-3"))); + tester.applications().deactivate(app1, ZoneId.from(Environment.test, RegionName.from("us-east-1"))); + tester.applications().deactivate(app1, ZoneId.from(Environment.staging, RegionName.from("us-east-3"))); tester.applications().deleteApplication(app1.id(), Optional.of(new NToken("ntoken"))); try (RotationLock lock = tester.applications().rotationRepository().lock()) { assertTrue("Rotation is unassigned", |