X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=0c5c32be695e6f67f37767e85a2521cda17b27e8;hb=c6fb00aad102d04f472b5b8cebf6ad37c7ab49fd;hp=15a68693cb7a807b0bae369eef674ed2def6075d;hpb=9d9b779eede0591bfa3b411d130a8ab48d75ad1f;p=osm%2Fvim-emu.git

diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh
index 15a6869..0c5c32b 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,7 +21,6 @@ W() {
 	    sleep 0.5s
 	done
 	EOF
-    cat ${SUBF}
     timeout -k 3s ${T} ${SUBF} "${1}"
     local RES=$?
     rm -f ${SUBF}
@@ -48,17 +46,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
@@ -69,13 +67,13 @@ son-emu-cli compute start -d datacenter1 -n vnf2 && sleep 1s
 son-emu-cli compute list && sleep 1s
 # Gather some infos
 Cmd 'sh echo "... starting various checks"'
-sync # avoid test overlapping
+sync # avoid text overlapping
 Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
 W "^... checked vnf1"
 Cmd 'vnf2 ifconfig && echo "... 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 "... checked ping"'
 W "^... checked ping" 20s
 Cmd 'quit'
 # Wait for sonemu to end