mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/lib/test: Introduce 'def' directive for frequently used patterns

Browse source 
For distribution tests, we'll repeat some tests frequently. Add a
'def' directive that starts a block, ended by 'endef', whose
execution can then be triggered by simply giving its name as a
directive itself.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-01-26 07:42:05 +01:00
parent 8ca491e7c0
commit 808ab390a0
1 changed files with 267 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
test/lib/test
View file

@ -86,57 +86,54 @@ test_iperf3() {
pane_wait "${__pane}" pane_wait "${__pane}"
} }
# test_one() - Run a single test file evaluating directives test_one_line() {
# $1: Name of test file, relative to test/ directory __line="${1}"
test_one() {
__dirclean=
__test_file="test/${1}"
__type="$(file -b --mime-type ${__test_file})"
if [ "${__type}" = "text/x-shellscript" ]; then
status_file_start "${1}" 1
"${__test_file}" && status_test_ok || status_test_fail
return
fi
__ntests="$(grep -c "^test$(printf '\t')" "${__test_file}")"
[ ${DEMO} -eq 0 ] && status_file_start "${1}" "${__ntests}"
[ ${CI} -eq 1 ] && video_link "${1}"
__subs=
__nok=-1
__perf_nok=0
__skip=0
while IFS= read -r __line; do
# Strip comments # Strip comments
__line="${__line%%#*}" __line="${__line%%#*}"
if [ -n "${TEST_ONE_in_def}" ]; then
[ "${__line}" = "endef" ] && TEST_ONE_in_def= && return
# Append $__line to variable TEST_ONE_DEF_<definition name>
__ifs="${IFS}"
IFS=
eval TEST_ONE_DEF_$TEST_ONE_in_def=\"\$\(printf \"%s\\n%s\" \"\$TEST_ONE_DEF_$TEST_ONE_in_def\" \"$__line\"\)\"
IFS="${__ifs}"
return
fi
# tab-split command and arguments, apply variable substitutions # tab-split command and arguments, apply variable substitutions
__cmd="${__line%%$(printf '\t')*}" __cmd="${__line%%$(printf '\t')*}"
__arg="${__line#*$(printf '\t')*}" __arg="${__line#*$(printf '\t')*}"
__arg="$(subs_apply "${__subs}" "${__arg}")" __arg="$(subs_apply "${TEST_ONE_subs}" "${__arg}")"
[ ${__nok} -eq 1 ] && [ "${__cmd}" != "test" ] && continue [ ${TEST_ONE_nok} -eq 1 ] && [ "${__cmd}" != "test" ] && continue
case ${__cmd} in case ${__cmd} in
"def")
TEST_ONE_in_def="${__arg}"
# Clear variable TEST_ONE_DEF_<definition name>
__ifs="${IFS}"
IFS= eval TEST_ONE_DEF_$TEST_ONE_in_def=
IFS="${__ifs}"
;;
"tempdir") "tempdir")
__tmpdir="$(mktemp -d)" __tmpdir="$(mktemp -d)"
__subs="$(list_add_pair "${__subs}" "__${__arg}__" "${__tmpdir}")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg}__" "${__tmpdir}")"
__dirclean="$(list_add "${__dirclean}" "${__tmpdir}")" TEST_ONE_dirclean="$(list_add "${TEST_ONE_dirclean}" "${__tmpdir}")"
;; ;;
"temp") "temp")
__tmpfile="$(mktemp)" __tmpfile="$(mktemp)"
__subs="$(list_add_pair "${__subs}" "__${__arg}__" "${__tmpfile}")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg}__" "${__tmpfile}")"
__dirclean="$(list_add "${__dirclean}" "${__tmpfile}")" TEST_ONE_dirclean="$(list_add "${TEST_ONE_dirclean}" "${__tmpfile}")"
;; ;;
"test") "test")
[ ${__perf_nok} -eq 0 ] || __nok=1 [ ${TEST_ONE_perf_nok} -eq 0 ] || TEST_ONE_nok=1
[ ${__nok} -eq 1 ] && status_test_fail [ ${TEST_ONE_nok} -eq 1 ] && status_test_fail
[ ${__nok} -eq 0 ] && status_test_ok [ ${TEST_ONE_nok} -eq 0 ] && status_test_ok
status_test_start "${__arg}" status_test_start "${__arg}"
__nok=0 TEST_ONE_nok=0
__perf_nok=0 TEST_ONE_perf_nok=0
;; ;;
"host") "host")
pane_run HOST "${__arg}" pane_run HOST "${__arg}"
@ -148,10 +145,13 @@ test_one() {
"hostw") "hostw")
pane_wait HOST pane_wait HOST
;; ;;
"hint")
tmux send-keys -t ${PANE_HOST} "C-c"
;;
"htools") "htools")
pane_run HOST 'which '"${__arg}"' >/dev/null || echo skip' pane_run HOST 'which '"${__arg}"' >/dev/null || echo skip'
pane_wait HOST pane_wait HOST
[ "$(pane_parse HOST)" = "skip" ] && { __skip=1; break; } [ "$(pane_parse HOST)" = "skip" ] && TEST_ONE_skip=1
;; ;;
"passt") "passt")
pane_run PASST "${__arg}" pane_run PASST "${__arg}"
@ -167,7 +167,7 @@ test_one() {
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run PASST "${__arg#* }" pane_run PASST "${__arg#* }"
pane_wait PASST pane_wait PASST
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse PASST)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse PASST)")"
;; ;;
"guest") "guest")
pane_run GUEST "${__arg}" pane_run GUEST "${__arg}"
@ -192,17 +192,17 @@ test_one() {
"gtools") "gtools")
pane_run GUEST 'which '"${__arg}"' >/dev/null || echo skip' pane_run GUEST 'which '"${__arg}"' >/dev/null || echo skip'
pane_wait GUEST pane_wait GUEST
[ "$(pane_parse GUEST)" = "skip" ] && { __skip=1; break; } [ "$(pane_parse GUEST)" = "skip" ] && TEST_ONE_skip=1
;; ;;
"g1tools") "g1tools")
pane_run GUEST_1 'which '"${__arg}"' >/dev/null || echo skip' pane_run GUEST_1 'which '"${__arg}"' >/dev/null || echo skip'
pane_wait GUEST_1 pane_wait GUEST_1
[ "$(pane_parse GUEST_1)" = "skip" ] && { __skip=1; break; } [ "$(pane_parse GUEST_1)" = "skip" ] && TEST_ONE_skip=1
;; ;;
"g2tools") "g2tools")
pane_run GUEST_2 'which '"${__arg}"' >/dev/null || echo skip' pane_run GUEST_2 'which '"${__arg}"' >/dev/null || echo skip'
pane_wait GUEST_2 pane_wait GUEST_2
[ "$(pane_parse GUEST_2)" = "skip" ] && { __skip=1; break; } [ "$(pane_parse GUEST_2)" = "skip" ] && TEST_ONE_skip=1
;; ;;
"guest2") "guest2")
pane_run GUEST_2 "${__arg}" pane_run GUEST_2 "${__arg}"
@ -227,42 +227,44 @@ test_one() {
"nstools") "nstools")
pane_run NS 'which '"${__arg}"' >/dev/null || echo skip' pane_run NS 'which '"${__arg}"' >/dev/null || echo skip'
pane_wait NS pane_wait NS
[ "$(pane_parse NS)" = "skip" ] && { __skip=1; break; } [ "$(pane_parse NS)" = "skip" ] && TEST_ONE_skip=1
;; ;;
"gout") "gout")
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run GUEST "${__arg#* }" pane_run GUEST "${__arg#* }"
pane_wait GUEST pane_wait GUEST
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse GUEST)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse GUEST)")"
;; ;;
"g1out") "g1out")
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run GUEST_1 "${__arg#* }" pane_run GUEST_1 "${__arg#* }"
pane_wait GUEST_1 pane_wait GUEST_1
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse GUEST_1)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse GUEST_1)")"
;; ;;
"g2out") "g2out")
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run GUEST_2 "${__arg#* }" pane_run GUEST_2 "${__arg#* }"
pane_wait GUEST_2 pane_wait GUEST_2
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse GUEST_2)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse GUEST_2)")"
;; ;;
"hout") "hout")
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run HOST "${__arg#* }" pane_run HOST "${__arg#* }"
pane_wait HOST pane_wait HOST
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse HOST)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse HOST)")"
;; ;;
"nsout") "nsout")
__varname="${__arg%% *}" __varname="${__arg%% *}"
pane_run NS "${__arg#* }" pane_run NS "${__arg#* }"
pane_wait NS pane_wait NS
__subs="$(list_add_pair "${__subs}" "__${__varname}__" "$(pane_parse NS)")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__varname}__" "$(pane_parse NS)")"
;; ;;
"check") "check")
info_check "${__arg}" info_check "${__arg}"
__nok=0
eval "${__arg} || __nok=1" eval "${__arg} || __nok=1"
if [ ${__nok} -eq 1 ]; then if [ ${__nok} -eq 1 ]; then
TEST_ONE_nok=1
info_check_failed info_check_failed
else else
info_check_passed info_check_passed
@ -290,23 +292,19 @@ test_one() {
table_end table_end
;; ;;
"bw") "bw")
table_value_throughput ${__arg} || __perf_nok=1 table_value_throughput ${__arg} || TEST_ONE_perf_nok=1
;; ;;
"lat") "lat")
table_value_latency ${__arg} || __perf_nok=1 table_value_latency ${__arg} || TEST_ONE_perf_nok=1
;; ;;
"iperf3c") "iperf3c")
set -x
test_iperf3 client ${__arg} test_iperf3 client ${__arg}
set +x
;; ;;
"iperf3s") "iperf3s")
set -x TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg%% *}__" "$(test_iperf3 server ${__arg#* })" )"
__subs="$(list_add_pair "${__subs}" "__${__arg%% *}__" "$(test_iperf3 server ${__arg#* })" )"
set +x
;; ;;
"set") "set")
__subs="$(list_add_pair "${__subs}" "__${__arg%% *}__" "${__arg#* }")" TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg%% *}__" "${__arg#* }")"
;; ;;
# Demo commands # Demo commands
@ -328,18 +326,58 @@ test_one() {
"killp") "killp")
pane_kill "${__arg}" pane_kill "${__arg}"
;; ;;
*)
__def_body="$(eval printf \"\$TEST_ONE_DEF_$__cmd\")"
if [ -n "${__def_body}" ]; then
__ifs="${IFS}"
IFS='
'
for __def_line in ${__def_body}; do
IFS= test_one_line "${__def_line}"
done
IFS="${__ifs}"
fi
;;
esac esac
}
# test_one() - Run a single test file evaluating directives
# $1: Name of test file, relative to test/ directory
test_one() {
TEST_ONE_dirclean=
__test_file="test/${1}"
__type="$(file -b --mime-type ${__test_file})"
if [ "${__type}" = "text/x-shellscript" ]; then
status_file_start "${1}" 1
"${__test_file}" && status_test_ok || status_test_fail
return
fi
__ntests="$(grep -c "^test$(printf '\t')" "${__test_file}")"
[ ${DEMO} -eq 0 ] && status_file_start "${1}" "${__ntests}"
[ ${CI} -eq 1 ] && video_link "${1}"
TEST_ONE_subs=
TEST_ONE_nok=-1
TEST_ONE_perf_nok=0
TEST_ONE_skip=0
TEST_ONE_in_def=
while IFS= read -r __line; do
test_one_line "${__line}"
[ ${TEST_ONE_skip} -eq 1 ] && break
done < "${__test_file}" done < "${__test_file}"
for __d in ${__dirclean}; do for __d in ${TEST_ONE_dirclean}; do
rm -rf ${__d} rm -rf ${__d}
done done
[ ${DEMO} -eq 1 ] && return [ ${DEMO} -eq 1 ] && return
[ ${__skip} -eq 1 ] && status_test_skip && return [ ${TEST_ONE_skip} -eq 1 ] && status_test_skip && return
[ ${__perf_nok} -eq 0 ] || __nok=1 [ ${TEST_ONE_perf_nok} -eq 0 ] || TEST_ONE_nok=1
[ ${__nok} -eq 0 ] && status_test_ok || status_test_fail [ ${TEST_ONE_nok} -eq 0 ] && status_test_ok || status_test_fail
} }
# test() - Build list of tests to run, in order, then issue test_one() # test() - Build list of tests to run, in order, then issue test_one()