summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-12-12 14:06:42 +0100
committerJon Marius Venstad <venstad@gmail.com>2019-12-12 14:06:42 +0100
commit053f042a5fb5e987194bf32f188f677fadf80259 (patch)
tree553d8c5ca21abf0b0306e3a4d5083679f142ae20 /config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
parent654ef6f11e8f7d5e02048e248448fcd7f030f23b (diff)
Fix validation of nested test jobs
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java')
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java6
1 files changed, 4 insertions, 2 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 584664b6ef1..e4f52f573b0 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
@@ -516,6 +516,7 @@ public class DeploymentSpecTest {
" <parallel>" +
" <region active='true' athenz-service='no-service'>ap-northeast-1</region>" +
" <region active='true'>ap-southeast-2</region>" +
+ " <test>aws-us-east-1a</test>" +
" </parallel>" +
" </steps>" +
" <delay hours='3' minutes='30' />" +
@@ -557,14 +558,15 @@ public class DeploymentSpecTest {
assertEquals(3, secondSerialSteps.size());
assertEquals("delay PT3H", secondSerialSteps.get(0).toString());
assertEquals("prod.aws-us-east-1a", secondSerialSteps.get(1).toString());
- assertEquals("2 parallel steps", secondSerialSteps.get(2).toString());
+ assertEquals("3 parallel steps", secondSerialSteps.get(2).toString());
List<DeploymentSpec.Step> innerParallelSteps = secondSerialSteps.get(2).steps();
- assertEquals(2, innerParallelSteps.size());
+ assertEquals(3, innerParallelSteps.size());
assertEquals("prod.ap-northeast-1", innerParallelSteps.get(0).toString());
assertEquals("no-service", spec.requireInstance("instance").athenzService(Environment.prod, RegionName.from("ap-northeast-1")).get().value());
assertEquals("prod.ap-southeast-2", innerParallelSteps.get(1).toString());
assertEquals("in-service", spec.requireInstance("instance").athenzService(Environment.prod, RegionName.from("ap-southeast-2")).get().value());
+ assertEquals("tests for prod.aws-us-east-1a", innerParallelSteps.get(2).toString());
}
@Test