diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 16:02:58 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 16:02:58 +0200 |
| commit | 6ea1a895c249153132a24b00e50785ccdbe78b6e (patch) | |
| tree | 16d781b48c70c6dd317236b9b5be2d22ebb8d072 /controller-server/src/test/java | |
| parent | 731d4fe97b56d6a0ad2f37e19c2d97b366072d47 (diff) | |
Simplify
Diffstat (limited to 'controller-server/src/test/java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java | 13 |
1 files changed, 2 insertions, 11 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 edf1948a256..fb850b1b321 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 @@ -6,6 +6,7 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.slime.ArrayTraverser; @@ -439,17 +440,7 @@ public class InternalStepRunnerTest { assertFile("test_runner_services.xml-cd", new String(InternalStepRunner.servicesXml(AthenzDomain.from("vespa.vespa.cd"), true, false, - false, - Optional.of("d-2-12-75")))); - } - - @Test - public void generates_correct_services_xml_in_aws() { - assertFile("test_runner_services.xml-aws", new String(InternalStepRunner.servicesXml(AthenzDomain.from("vespa.vespa.cd"), - true, - true, - false, - Optional.empty()))); + new NodeResources(2, 12, 75, 1)))); } private void assertFile(String resourceName, String actualContent) { |