commit e827c0ed9b626d8e20bf2a95052a25c48c95f509
author Thomas Vachuska <tom@onlab.us> Tue Aug 04 16:53:18 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Aug 05 00:22:55 2015 +0000
tree bda1ebf3b9cb11f4283c7416e40d5056eb08b553
parent dd80557afc20529445c15f7d24dfebdfef99fca9

FIxing a few glitches in STC and scenarios.

Change-Id: I55379c53392ad94e5c5d41b6ceb77d2382fa0d29

tools/test/scenarios/net-setup.xml

diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index abfd84c..5b71dfe 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -34,14 +34,13 @@
         <step name="Check-Summary" requires="Wait-For-Mininet"
               exec="onos-check-summary ${OC1} [0-9]* 25 140 0"/>
 
-        <step name="Balance-Masters" requires="Check-Summary"
+        <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"
               exec="onos ${OC1} balance-masters"/>
 
-        <step name="Pause-For-Masters" requires="Balance-Masters"
+        <step name="Pause-For-Masters" requires="Balance-Masters" if="${OC2}"
               exec="sleep 10"/>
 
-        <step name="Check-Flows" requires="~Pause-For-Masters"
+        <step name="Check-Flows" requires="~Pause-For-Masters,~Check-Summary"
               exec="onos-check-flows ${OC1}"/>
-
     </group>
 </scenario>
\ No newline at end of file