projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #212 from cgeoffroy/pr/fix_manualexamples_textoverlap
[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
371fcd0
..
2d43e36
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
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
while true; do
if strings screenlog.0 | grep -m 1 "\${1}"; then
exit 0
@@
-22,10
+21,14
@@
W() {
sleep 0.5s
done
EOF
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}
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}
}
return ${RES}
}
@@
-67,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
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
# Gather some infos
+Cmd 'sh sync'
Cmd 'sh echo "... starting various checks"'
sync # avoid text overlapping
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"
W "^... checked vnf1"
-Cmd 'vnf2 ifconfig && echo
"
... checked vnf2"'
+Cmd 'vnf2 ifconfig && echo
-e "\\n
... checked vnf2"'
W "^... checked vnf2"
# Try to ping vnfs
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 "^... checked ping" 20s
Cmd 'quit'
# Wait for sonemu to end
-W '
^
*** Done'
+W '*** Done'
echo -e '\n\n******************* Result ******************\n\n'
strings screenlog.0
echo -e '\n\n******************* Result ******************\n\n'
strings screenlog.0