Improved test widget launcher script

Improved test widget launcher script which calls verb
synchronously and therefore we can correctly detect the end
of the test session and exit.

Bug-AGL: SPEC-1821

Change-Id: I76b777770403ad9afcc72faeeb50188f52fe1223
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/test-widget/launcher.sh.in b/test-widget/launcher.sh.in
index 005c433..7414a7b 100644 (file)
--- a/test-widget/launcher.sh.in
+++ b/test-widget/launcher.sh.in
@@ -34,27 +34,17 @@ declare -a testVerb
 
 if [[ $(jq '.testVerb|type' $CFGFILE) == "array" ]]
 then
-       testVerbLength=$(jq '.testVerb | length')
-       for (( idx=0; idx<testVerbLength; idx++ )) do
-               testVerb[$idx]=$(jq -r ".testVerb[$idx].uid" ${CFGFILE})
-       done
+        testVerbLength=$(jq '.testVerb | length')
+        for (( idx=0; idx<testVerbLength; idx++ )) do
+                testVerb[$idx]=$(jq -r ".testVerb[$idx].uid" ${CFGFILE})
+        done
 else
-       testVerb[0]=$(jq -r ".testVerb.uid" ${CFGFILE})
+        testVerb[0]=$(jq -r ".testVerb.uid" ${CFGFILE})
 fi
 
-tail -f  $AFBCLIENTIN | afb-client-demo ws://localhost:${PORT}/api?token=${TOKEN} > $AFBCLIENTOUT 2>&1 &
-CLIENTPID=$!
-
 testVerbLength=${#testVerb[@]}
 for (( idx=0; idx<testVerbLength; idx++ )) do
-       echo "$API ${testVerb[$idx]}" > $AFBCLIENTIN
+        afb-client-demo -s ws://localhost:${PORT}/api?token=${TOKEN} "$API" "${testVerb[$idx]}"
 done
 
-while read -r line
-do
-       [ "$(echo "${line}" | grep -E 'Ran [[:digit:]]+ tests in')" ] && break
-done < $AFBCLIENTOUT
-
-rm -f $AFBCLIENTIN
-rm -f $AFBCLIENTOUT
-kill $CLIENTPID
+afb-client-demo ws://localhost:${PORT}/api?token=${TOKEN} "$API" "exit"