Avoid using printheader

[osm/vim-emu.git] / utils / ci / check_manual_usage_example.sh

diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh
index 15a6869..677b673 100755 (executable)
--- 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 "(Debug) Error while waiting for a pattern to appear in screenlog.0"
+        strings screenlog.0
+    fi
     return ${RES}
 }
 
@@ -48,17 +51,17 @@ if ! timeout --version; then
     timeout --version
 fi
 # Initial cleanup
-pkill -f 'screen -L -S sonemu' || true
+pkill -f 'SCREEN -L -S sonemu' || true
 screen -wipe || true
 rm -f screenlog.0
 
 
 # Start containernet with a topology
-screen -L -S sonemu -d -m python src/emuvim/examples/simple_topology.py
+screen -L -S sonemu -d -m sudo python src/emuvim/examples/simple_topology.py
 # Setup screen for immediate flusing
 screen -S sonemu -X logfile flush 0
 # Wait for the cli to start
-W '^*** Starting CLI:'
+W '^*** Starting CLI:' 60s
 # Print nodes
 Cmd 'nodes'
 # Start vnf1
@@ -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"'
-sync # avoid test overlapping
-Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
+Cmd 'sh sync && echo -e "\n... starting various checks"'
+sync # avoid text overlapping
+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