diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-11-11 16:16:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-11 16:16:27 +0100 |
commit | 699087311d14e7a270f0eaab76747d62ca03d2cd (patch) | |
tree | 41764b76d1933ac3208aa419552bfe8af402ec93 /config-model-api | |
parent | addec6a36075d63d2ad6e93069a7bb19bd75716a (diff) | |
parent | 780128abb923e4d026891dd903084285cbb8830a (diff) |
Merge pull request #24839 from vespa-engine/jonmv/accept-no-test-zip
Accept no test zip
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java index c6dfa0f8cb7..465f35e0b43 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java @@ -1588,30 +1588,31 @@ public class DeploymentSpecTest { @Test public void cloudAccount() { - StringReader r = new StringReader( - "<deployment version='1.0' cloud-account='100000000000'>" + - " <instance id='alpha'>" + - " <prod cloud-account='800000000000'>" + - " <region>us-east-1</region>" + - " </prod>" + - " </instance>" + - " <instance id='beta' cloud-account='200000000000'>" + - " <staging cloud-account='600000000000'/>" + - " <perf cloud-account='700000000000'/>" + - " <prod>" + - " <region>us-west-1</region>" + - " </prod>" + - " </instance>" + - " <instance id='main'>" + - " <test cloud-account='500000000000'/>" + - " <dev cloud-account='400000000000'/>" + - " <prod>" + - " <region cloud-account='300000000000'>us-east-1</region>" + - " <region>eu-west-1</region>" + - " </prod>" + - " </instance>" + - "</deployment>" - ); + String r = + """ + <deployment version='1.0' cloud-account='100000000000'> + <instance id='alpha'> + <prod cloud-account='800000000000'> + <region>us-east-1</region> + </prod> + </instance> + <instance id='beta' cloud-account='200000000000'> + <staging cloud-account='600000000000'/> + <perf cloud-account='700000000000'/> + <prod> + <region>us-west-1</region> + </prod> + </instance> + <instance id='main'> + <test cloud-account='500000000000'/> + <dev cloud-account='400000000000'/> + <prod> + <region cloud-account='300000000000'>us-east-1</region> + <region>eu-west-1</region> + </prod> + </instance> + </deployment> + """; DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals(Optional.of(new CloudAccount("100000000000")), spec.cloudAccount()); assertCloudAccount("800000000000", spec.requireInstance("alpha"), Environment.prod, "us-east-1"); |