commit 4cfcc56d4ceec1bd4a33566197adccea95f6508f
author Thomas Vachuska <tom@onlab.us> Wed Jun 03 09:51:02 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Jun 03 17:43:13 2015 +0000
tree 837dd850252421bd60b99ad3613c1f0b38df7bbe
parent af579749688d72b2a8dc337f8eb5fea11764325e

Enhancing STC and cleaning up various test topos.

Change-Id: I7f5b349835ebf3d7da824be0aa2cddd860631f84

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 106165a..93500f5 100755
--- a/tools/test/bin/onos-wait-for-start
+++ b/tools/test/bin/onos-wait-for-start
@@ -10,10 +10,14 @@
 
 ssh -t $remote "
     # Wait until we reach the run-level 100
-    running=""
-    while [ -z \$running ]; do
+    for i in \$(seq 1 30); do
         $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \
-            grep -q 'START LEVEL 100' && running=1 || sleep 2
+            grep -q 'START LEVEL 100' && break || sleep 2
     done
 
+    # Wait until ApplicationManager is available
+    for i in \$(seq 1 5); do
+        grep -q \" ApplicationManager .* Started\" \
+            $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1
+    done
 "