commit c544f631589057cf784b685558f4d86f57977390
author Thomas Vachuska <tom@onlab.us> Tue Jun 02 11:29:59 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jun 02 18:34:33 2015 +0000
tree 9d37193a3301a2545442a338ba355619e2d91b09
parent d2afaf2a6a0b941eaef4a261968225f8defb703a

Fixing STC scenarios.

Change-Id: Ic5ec4696d414751f839dbb341717dcde0cb96cc9

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 9630c98..585bf43 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -30,9 +30,9 @@
             <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
             <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
-                  requires="~Wait-for-Start-${#}"/>
+                  requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
             <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
-                  requires="~Wait-for-Start-${#}"/>
+                  requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
         </parallel>
     </group>
 </scenario>

tools/test/scenarios/tar-setup.xml

diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index 964c83e..87ba8cd 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -18,8 +18,7 @@
         <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
 
         <parallel var="${OC#}">
-            <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}"
-                  unless="${OCT}"/>
+            <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
             <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
             <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
 
@@ -31,35 +30,31 @@
 
             <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
-            <step name="Check-Components-${#}"
-                  exec="onos-check-components ${OC#}"
-                  requires="~Wait-for-Start-${#}"/>
+            <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
+                  requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
             <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
-                  requires="~Wait-for-Start-${#}"/>
+                  requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
 
             <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
-                  requires="~Wait-for-Start-${#}"/>
+                  requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
         </parallel>
     </group>
 
     <group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}">
         <step name="Form-Cluster" exec="onos-form-cluster cell"/>
         <parallel var="${OC#}">
-            <step name="Wait-for-Start-Again-${#}"
-                  exec="onos-wait-for-start ${OC#}"
+            <step name="Wait-for-Start-Again-${#}" exec="onos-wait-for-start ${OC#}"
                   requires="Form-Cluster"/>
 
             <step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}"
                   requires="~Wait-for-Start-Again-${#}"/>
-            <step name="Check-Components-Again-${#}"
-                  exec="onos-check-components ${OC#}"
-                  requires="~Wait-for-Start-Again-${#}"/>
-            <step name="Check-Apps-Again-${#}"
-                  exec="onos-check-apps ${OC#} drivers"
-                  requires="~Wait-for-Start-Again-${#}"/>
+            <step name="Check-Components-Again-${#}" exec="onos-check-components ${OC#}"
+                  requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
+            <step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers"
+                  requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
 
             <step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
-                  requires="~Wait-for-Start-Again-${#}"/>
+                  requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
         </parallel>
     </group>