X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=9d8b55d0bd9cf21d89495c01b056dd69cfb48cdc;hb=e2a4849c826900cf257a9ee471d363fd63db3927;hp=96e780c19eb53a3b96c0571b35f7e9e8f6502323;hpb=116d394efc273145b46b2b7318ab63d72f45f811;p=osm%2Fvim-emu.git

diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh
index 96e780c..9d8b55d 100755
--- a/utils/ci/check_manual_usage_example.sh
+++ b/utils/ci/check_manual_usage_example.sh
@@ -21,9 +21,14 @@ W() {
 	    sleep 0.5s
 	done
 	EOF
-    timeout -k 3s ${T} ${SUBF} "${1}"
-    local RES=$?
+    local RES=0
+    timeout -k 3s ${T} ${SUBF} "${1}" || RES=$?
     rm -f ${SUBF}
+    if [ ! "$RES" = "0" ]; then
+        sync
+        echo -e "\n\n\n(Debug) Error while waiting for a pattern to appear in screenlog.0\n\n\n"
+        strings screenlog.0
+    fi
     return ${RES}
 }
 
@@ -46,7 +51,8 @@ if ! timeout --version; then
     timeout --version
 fi
 # Initial cleanup
-pkill -f 'SCREEN -L -S sonemu' || true
+pkill --signal KILL -f 'SCREEN -L -S sonemu' || true
+sleep 1s
 screen -wipe || true
 rm -f screenlog.0
 
@@ -65,19 +71,21 @@ son-emu-cli compute start -d datacenter1 -n vnf1 && sleep 1s
 son-emu-cli compute start -d datacenter1 -n vnf2 && sleep 1s
 # List compute nodes
 son-emu-cli compute list && sleep 1s
+sync # avoid text overlapping
 # Gather some infos
+Cmd 'sh sync'
 Cmd 'sh echo "... starting various checks"'
 sync # avoid text overlapping
-Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
+Cmd 'vnf1 ifconfig && echo -e "\\n... checked vnf1"'
 W "^... checked vnf1"
-Cmd 'vnf2 ifconfig && echo "... checked vnf2"'
+Cmd 'vnf2 ifconfig && echo -e "\\n... checked vnf2"'
 W "^... checked vnf2"
 # Try to ping vnfs
-Cmd 'vnf1 ping -c 2 vnf2 || echo "... checked ping"'
+Cmd 'vnf1 ping -c 2 vnf2 && echo -e "\\n... checked ping"'
 W "^... checked ping" 20s
 Cmd 'quit'
 # Wait for sonemu to end
-W '^*** Done'
+W '*** Done'
 
 echo -e '\n\n******************* Result ******************\n\n'
 strings screenlog.0