commit f1c42080a111d67c3d93748641aa4ff541389802
author Thomas Vachuska <tom@onlab.us> Fri Jul 10 16:41:31 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 13 15:02:53 2015 +0000
tree 0a8c09bcac56024f963cc95b06c38ad57f9ea0d4
parent 738dfafd6a353dd40f90907ff2688a578ab36681

Adding more aggressive and thorough implementation of wipe-out command.

Change-Id: I828ccdc994a490e17c2806d27aa36460da10f795

tools/test/bin/onos-mininet

diff --git a/tools/test/bin/onos-mininet b/tools/test/bin/onos-mininet
index 5bcd2f5..5f11fd0 100755
--- a/tools/test/bin/onos-mininet
+++ b/tools/test/bin/onos-mininet
@@ -44,6 +44,10 @@
     "
     ;;
 
+attach)
+    $mininet -x
+    ;;
+
 start)
     ssh $remote "rm -f $log; echo logfile flush 1 > ~/.screenrc"
     (

tools/test/scenarios/net-teardown.xml

diff --git a/tools/test/scenarios/net-teardown.xml b/tools/test/scenarios/net-teardown.xml
index fa52ce3..a5d93ee 100644
--- a/tools/test/scenarios/net-teardown.xml
+++ b/tools/test/scenarios/net-teardown.xml
@@ -16,6 +16,6 @@
 <scenario name="net-setup" description="Network teardown steps">
     <group name="Net-Teardown">
         <step name="Stop-Mininet" exec="onos-mininet stop"/>
-        <step name="Wipe-Out-Data-After" requires="~Stop-Mininet" exec="onos-wipe-out"/>
+        <XXXstep name="Wipe-Out-Data-After" requires="~Stop-Mininet" exec="onos-wipe-out"/>
     </group>
 </scenario>
\ No newline at end of file