X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=ea8c2af7770b9ab1be70e8e882ad30c80026e143;hb=5ca7aae70bfb9a8df5aed1fc44b195d7a13c462d;hp=371fcd05cbdfc2291e9e1b72d6888b9e1e389734;hpb=6f86be7fd0c7a4bc9ce931387cb8e3266f5bc355;p=osm%2Fvim-emu.git

diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh
index 371fcd0..ea8c2af 100755
--- a/utils/ci/check_manual_usage_example.sh
+++ b/utils/ci/check_manual_usage_example.sh
@@ -14,7 +14,6 @@ W() {
     chmod +x ${SUBF}
     cat > ${SUBF} <<- EOF
 	#!/bin/bash -e
-	set -x
 	while true; do
 	    if strings screenlog.0 | grep -m 1 "\${1}"; then
 	        exit 0
@@ -22,10 +21,14 @@ W() {
 	    sleep 0.5s
 	done
 	EOF
-    cat ${SUBF}
-    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}
 }
 
@@ -67,19 +70,20 @@ 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 echo "... starting various checks"'
+Cmd 'sh sync && echo -e "\n... starting various checks"'
 sync # avoid text overlapping
-Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
+Cmd 'vnf1 ifconfig && sync && echo -e "\n... checked vnf1"'
 W "^... checked vnf1"
-Cmd 'vnf2 ifconfig && echo "... checked vnf2"'
+Cmd 'vnf2 ifconfig && sync && 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 && sync && 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