1 files changed, 15 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 e4f52f573b0..ac605add892 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
@@ -77,9 +77,8 @@ public class DeploymentSpecTest {
         );
 
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(2, spec.steps().size());
+        assertEquals(1, spec.steps().size());
         assertEquals(1, spec.requireInstance("default").steps().size());
-        assertTrue(spec.steps().get(0).concerns(Environment.test));
         assertTrue(spec.requireInstance("default").steps().get(0).concerns(Environment.staging));
         assertFalse(spec.requireInstance("default").deploysTo(Environment.test, Optional.empty()));
         assertTrue(spec.requireInstance("default").deploysTo(Environment.staging, Optional.empty()));
@@ -101,13 +100,9 @@ public class DeploymentSpecTest {
         );
 
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(3, spec.steps().size());
+        assertEquals(1, spec.steps().size());
         assertEquals(2, spec.requireInstance("default").steps().size());
 
-        assertTrue(spec.steps().get(0).concerns(Environment.test));
-
-        assertTrue(spec.steps().get(1).concerns(Environment.staging));
-
         assertTrue(spec.requireInstance("default").steps().get(0).concerns(Environment.prod, Optional.of(RegionName.from("us-east1"))));
         assertFalse(((DeploymentSpec.DeclaredZone)spec.requireInstance("default").steps().get(0)).active());
 
@@ -500,6 +495,7 @@ public class DeploymentSpecTest {
     public void testNestedParallelAndSteps() {
         StringReader r = new StringReader(
                 "<deployment athenz-domain='domain'>" +
+                "   <staging />" +
                 "   <instance id='instance' athenz-service='in-service'>" +
                 "      <prod>" +
                 "         <parallel>" +
@@ -529,13 +525,12 @@ public class DeploymentSpecTest {
 
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         List<DeploymentSpec.Step> steps = spec.steps();
-        assertEquals(3, steps.size());
-        assertEquals("test", steps.get(0).toString());
-        assertEquals("staging", steps.get(1).toString());
-        assertEquals("instance 'instance'", steps.get(2).toString());
-        assertEquals(Duration.ofHours(4), steps.get(2).delay());
+        assertEquals(2, steps.size());
+        assertEquals("staging", steps.get(0).toString());
+        assertEquals("instance 'instance'", steps.get(1).toString());
+        assertEquals(Duration.ofHours(4), steps.get(1).delay());
 
-        List<DeploymentSpec.Step> instanceSteps = steps.get(2).steps();
+        List<DeploymentSpec.Step> instanceSteps = steps.get(1).steps();
         assertEquals(2, instanceSteps.size());
         assertEquals("4 parallel steps", instanceSteps.get(0).toString());
         assertEquals("prod.us-north-7", instanceSteps.get(1).toString());
@@ -590,12 +585,10 @@ public class DeploymentSpecTest {
 
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         List<DeploymentSpec.Step> steps = spec.steps();
-        assertEquals(3, steps.size());
-        assertEquals("test", steps.get(0).toString());
-        assertEquals("staging", steps.get(1).toString());
-        assertEquals("2 parallel steps", steps.get(2).toString());
+        assertEquals(1, steps.size());
+        assertEquals("2 parallel steps", steps.get(0).toString());
 
-        List<DeploymentSpec.Step> parallelSteps = steps.get(2).steps();
+        List<DeploymentSpec.Step> parallelSteps = steps.get(0).steps();
         assertEquals("instance 'instance0'", parallelSteps.get(0).toString());
         assertEquals("instance 'instance1'", parallelSteps.get(1).toString());
     }
@@ -620,12 +613,10 @@ public class DeploymentSpecTest {
 
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         List<DeploymentSpec.Step> steps = spec.steps();
-        assertEquals(5, steps.size());
-        assertEquals("test", steps.get(0).toString());
-        assertEquals("staging", steps.get(1).toString());
-        assertEquals("instance 'instance0'", steps.get(2).toString());
-        assertEquals("delay PT12H", steps.get(3).toString());
-        assertEquals("instance 'instance1'", steps.get(4).toString());
+        assertEquals(3, steps.size());
+        assertEquals("instance 'instance0'", steps.get(0).toString());
+        assertEquals("delay PT12H", steps.get(1).toString());
+        assertEquals("instance 'instance1'", steps.get(2).toString());
     }
 
     @Test