X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=2d43e36d212f423e08a6053b8c83c7ec90d3cafb;hb=ee5179f161d10b35a8a73f495ca3692fda9b2e71;hp=0c5c32be695e6f67f37767e85a2521cda17b27e8;hpb=b9e768fae8c8c265d28b44ee2110ae748aaa23b9;p=osm%2Fvim-emu.git diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh index 0c5c32b..2d43e36 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} } @@ -65,19 +70,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