commit 0cec548f7c38cba40152c8ef22882448c0b4652c
author Thomas Vachuska <tom@onlab.us> Thu Dec 10 13:40:07 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 10 21:40:40 2015 +0000
tree 9ee820921d84dab01378e71d3d75fe7248a6e687
parent f4ffb940f9f9c9dff6bb407b55541783cb90766f

Small stc scenario fixes and simplifications.

Change-Id: I31e639016ab0050f7e5358bf9d3db86182229f30

tools/test/scenarios/archetypes.xml

diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 790b334..243d797 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -24,7 +24,8 @@
         <step name="Install-App" requires="^"
               exec="onos-app ${OCI} install! target/test-app-1.2.3.oar"/>
         <step name="Verify-App" requires="^" delay="5"
-              exec="onos-check-components ${OCI} org.test.app.AppComponent"/>
+              exec="onos ${OCI} scr:details org.test.app.AppComponent"
+              FIXME="onos-check-components ${OCI} org.test.app.AppComponent"/>
 
         <step name="Create-App-CLI-Overlay" requires="Install-App"
               exec="onos-create-app cli org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>

tools/test/scenarios/net-setup.xml

diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index 13252d0..ce15bf8 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -37,10 +37,7 @@
         <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"
               exec="onos ${OC1} balance-masters"/>
 
-        <step name="Pause-For-Masters" requires="Balance-Masters" if="${OC2}"
-              exec="sleep 10"/>
-
-        <step name="Check-Flows" requires="~Pause-For-Masters,~Check-Summary"
+        <step name="Check-Flows" requires="~Balance-Masters,~Check-Summary" delay="10"
               exec="onos-check-flows ${OC1}"/>
     </group>
 </scenario>