commit 822bc14ae426c9298851ac4d370c65e15b1a3443
author Thomas Vachuska <tom@onlab.us> Tue Nov 22 15:47:23 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Nov 22 23:51:30 2016 +0000
tree 7eea02add752ab8d68ea8624a237d46ca3e2963d
parent d89bfd0602481e86ba7dd751e46ade82e9528132

Increased tolerance for node stop/start and for topology convergence.

Change-Id: Ie9ea56918011b9e34c5ed6a6d426199bfe3e26d9

tools/test/bin/onos-check-summary

diff --git a/tools/test/bin/onos-check-summary b/tools/test/bin/onos-check-summary
index c1139c3..69bc0ac 100755
--- a/tools/test/bin/onos-check-summary
+++ b/tools/test/bin/onos-check-summary
@@ -6,7 +6,7 @@
 aux=/tmp/stc-$$.log
 trap "rm -f $aux 2>/dev/null" EXIT
 
-for i in {1..10}; do
+for i in {1..15}; do
     onos ${1:-$OCI} "onos:summary" > $aux
     cat $aux
 

tools/test/bin/onos-wait-for-start

diff --git a/tools/test/bin/onos-wait-for-start b/tools/test/bin/onos-wait-for-start
index e643b5a..e0ebb54 100755
--- a/tools/test/bin/onos-wait-for-start
+++ b/tools/test/bin/onos-wait-for-start
@@ -13,13 +13,13 @@
 
 ssh -t $remote "
     # Wait until we reach the run-level 100
-    for i in \$(seq 1 45); do
+    for i in {1..90}; do
         $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \
             grep -q 'START LEVEL 100' && break || sleep 2
     done
 
     # Wait until ApplicationManager is available
-    for i in \$(seq 1 10); do
+    for i in {1..10}; do
         grep -q \" ApplicationManager .* Started\" \
             $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1
     done

tools/test/bin/onos-wait-for-stop

diff --git a/tools/test/bin/onos-wait-for-stop b/tools/test/bin/onos-wait-for-stop
index a684c23..ebb1d6d 100755
--- a/tools/test/bin/onos-wait-for-stop
+++ b/tools/test/bin/onos-wait-for-stop
@@ -13,7 +13,7 @@
 
 ssh -t $remote "
     # Wait until ONOS Java process terminates
-    for i in \$(seq 1 45); do
+    for i in {1..90}; do
         ps -ef | egrep 'java .*/onos/.* org\.apache\.karaf\.main\.Main' | grep -qv grep || exit 0
         sleep 1
     done

tools/test/scenarios/ha-cluster-restart.xml

diff --git a/tools/test/scenarios/ha-cluster-restart.xml b/tools/test/scenarios/ha-cluster-restart.xml
index 16b4b27..d042bbe 100644
--- a/tools/test/scenarios/ha-cluster-restart.xml
+++ b/tools/test/scenarios/ha-cluster-restart.xml
@@ -25,7 +25,9 @@
             </parallel>
         </group>
 
-        <group name="Recover" requires="~Fail">
+        <step name="Breathe" exec="sleep 5" requires="~Fail"/>
+
+        <group name="Recover" requires="~Breathe,~Fail">
             <parallel var="${OC#}">
                 <step name="Node-Start-${#}" exec="onos-service ${OC#} start"/>
                 <step name="Wait-for-Start-${#}" requires="~Node-Start-${#}"