summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:14:29 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-16 12:55:44 +0200
commit35065ca3a59d327e68b18b5cf2080fb940b6ee4d (patch)
tree19ce368c4847c82f2524c1ffa75d40dacc0d291f
parentf75c2d7bc051fcbd4d0589a9204a1d18c5bf3d00 (diff)
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>
-rw-r--r--test-widget/launcher.sh.in24
1 files changed, 7 insertions, 17 deletions
diff --git a/test-widget/launcher.sh.in b/test-widget/launcher.sh.in
index 005c433..7414a7b 100644
--- 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"