diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-14 13:53:40 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-14 13:53:40 +0200 |
| commit | 45e950796cf6b74921bad6445d6e84650a3e5937 (patch) | |
| tree | 6387fc17814829801355a0e50f89e96258a91485 /controller-server/src/test/java | |
| parent | 79f3fd272149f03c1e8ad736796044c80b586ebe (diff) | |
Always use value for SystemName, Environment and RegionName
Diffstat (limited to 'controller-server/src/test/java')
2 files changed, 2 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java index 02a4bfcdbe6..c97c29e2441 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java @@ -18,7 +18,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.LogEntry; import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType; import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId; import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud; -import com.yahoo.vespa.hosted.controller.api.integration.routing.RoutingEndpoint; import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMailer; import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; import org.junit.Before; @@ -251,7 +250,7 @@ public class InternalStepRunnerTest { Inspector configObject = SlimeUtils.jsonToSlime(tester.cloud().config()).get(); assertEquals(appId.serializedForm(), configObject.field("application").asString()); assertEquals(JobType.systemTest.zone(tester.tester().controller().system()).value(), configObject.field("zone").asString()); - assertEquals(tester.tester().controller().system().name(), configObject.field("system").asString()); + assertEquals(tester.tester().controller().system().value(), configObject.field("system").asString()); assertEquals(1, configObject.field("endpoints").children()); assertEquals(1, configObject.field("endpoints").field(JobType.systemTest.zone(tester.tester().controller().system()).value()).entries()); configObject.field("endpoints").field(JobType.systemTest.zone(tester.tester().controller().system()).value()).traverse((ArrayTraverser) (__, endpoint) -> diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java index b81edaccd09..8e12268c197 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java @@ -48,7 +48,7 @@ public class ControllerContainerTest { " <maxthreads>10</maxthreads>\n" + " </config> \n" + " <config name=\"cloud.config.configserver\">\n" + - " <system>" + system().name() + "</system>\n" + + " <system>" + system().value() + "</system>\n" + " </config> \n" + " <config name=\"vespa.hosted.rotation.config.rotations\">\n" + " <rotations>\n" + |