aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-15 17:55:29 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:16:20 +0200
commit4ce9ad5b04cf1b2d0a7cc3f3b47d11572a720c27 (patch)
tree03a6518412677b732d450f792c95669725ca7f92
parent7adca8611c1c105d4af2d8b0065be0e59f79ea05 (diff)
Improved test widget launcher scriptorigin/claneys/master
Improved test widget launcher script which calls verb synchronously and therefore we can correctly detect the end of the test session and exit. Change-Id: I66e404cfe1a25f1986bc722572efa93979d43bc2 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--test-wgt/launcher.sh.in24
1 files changed, 7 insertions, 17 deletions
diff --git a/test-wgt/launcher.sh.in b/test-wgt/launcher.sh.in
index 005c433..7414a7b 100644
--- a/test-wgt/launcher.sh.in
+++ b/test-wgt/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"