commit 534f4762b1485ce80a561da76b69afd3700d724d
author Thomas Vachuska <tom@onlab.us> Tue Aug 30 16:25:13 2016 -0700
committer Thomas Vachuska <tom@onlab.us> Tue Aug 30 16:28:54 2016 -0700
tree a82c94c8114e9262742678cdcce08d15405d728f
parent c217cb999d00ace4cd07b0476c133792344118e9

Miscellaneous STC adjustments

Change-Id: Ia1d5629d075646192f154b03bec6a71a8ac44dbd

tools/test/bin/onos-check-component

diff --git a/tools/test/bin/onos-check-component b/tools/test/bin/onos-check-component
index 686d936..27ce619 100755
--- a/tools/test/bin/onos-check-component
+++ b/tools/test/bin/onos-check-component
@@ -13,7 +13,7 @@
 for attempt in {1..30}; do
     onos ${node:-$OCI} scr:list  | grep $component > $aux
 
-    if grep -q $state $aux; then
+    if grep $state $aux; then
         exit 0
     else
         sleep 1

tools/test/bin/onos-mininet

diff --git a/tools/test/bin/onos-mininet b/tools/test/bin/onos-mininet
index 5256166..9079e88 100755
--- a/tools/test/bin/onos-mininet
+++ b/tools/test/bin/onos-mininet
@@ -6,7 +6,7 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-export MAX_WAIT=60
+export MAX_WAIT=${ONOS_MN_TIMEOUT:-90}
 
 cmd="$1" && shift
 log="screenlog.0"