diff options
| author | Karel Zak <kzak@redhat.com> | 2023-08-01 10:43:59 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2023-08-01 10:43:59 +0200 |
| commit | e3a1b5e6d0db08acaf3fbd72d5680c945d68f10d (patch) | |
| tree | a222454ab06204538b4c7ed2c4734f49e7d6982f | |
| parent | df0c1e7dc981277eab60f1cfcdf1af61bfe946f3 (diff) | |
| parent | eaa3870880aaa8d3d6b1aa8ea6bb19a717708b8e (diff) | |
| download | util-linux-e3a1b5e6d0db08acaf3fbd72d5680c945d68f10d.tar.gz | |
Merge branch 'lsfd--fix-2399-use-fifo-in-test-cases' of https://github.com/masatake/util-linux
* 'lsfd--fix-2399-use-fifo-in-test-cases' of https://github.com/masatake/util-linux:
tests: (lsfd::option-inet) get child-processes' pids via fifo
| -rwxr-xr-x | tests/ts/lsfd/option-inet | 60 |
1 files changed, 46 insertions, 14 deletions
diff --git a/tests/ts/lsfd/option-inet b/tests/ts/lsfd/option-inet index e55a676c2b..b0910f230c 100755 --- a/tests/ts/lsfd/option-inet +++ b/tests/ts/lsfd/option-inet @@ -25,23 +25,54 @@ ts_skip_docker ts_check_test_command "$TS_CMD_LSFD" ts_check_test_command "$TS_HELPER_MKFDS" +ts_check_prog "mkfifo" + ts_cd "$TS_OUTDIR" +FIFO=./test_mkfds-option-inet.fifo { - "$TS_HELPER_MKFDS" -q tcp 3 4 5 server-port=34567 client-port=23456 & - PID0=$! - - "$TS_HELPER_MKFDS" -q tcp6 3 4 5 server-port=34567 client-port=23456 & - PID1=$! - - "$TS_HELPER_MKFDS" -q ro-regular-file 3 file=/etc/passwd & - PID2=$! - - "$TS_HELPER_MKFDS" -q udp 3 4 server-port=34567 client-port=23456 server-do-bind=1 client-do-bind=1 client-do-connect=1& - PID3=$! - - "$TS_HELPER_MKFDS" -q udp6 3 4 lite=1 server-port=34567 client-port=23456 server-do-bind=1 client-do-bind=1 client-do-connect=1& - PID4=$! + rm -f "${FIFO}" + if ! mkfifo "${FIFO}"; then + ts_finalize "failed in creating a fifo" + fi + + "$TS_HELPER_MKFDS" tcp 3 4 5 server-port=34567 client-port=23456 > "${FIFO}" & + if ! read PID0 < "${FIFO}"; then + rm "${FIFO}" + ts_finalize "$TS_HELPER_MKFDS tcp...doesn't report its pid" + fi + + "$TS_HELPER_MKFDS" tcp6 3 4 5 server-port=34567 client-port=23456 > "${FIFO}" & + if ! read PID1 < "${FIFO}"; then + kill -CONT "${PID0}" + wait "${PID0}" + rm "${FIFO}" + ts_finalize "$TS_HELPER_MKFDS tcp6...doesn't report its pid" + fi + + "$TS_HELPER_MKFDS" ro-regular-file 3 file=/etc/passwd > "${FIFO}" & + if ! read PID2 < "${FIFO}"; then + kill -CONT "${PID0}" "${PID1}" + wait "${PID0}" "${PID1}" + rm "${FIFO}" + ts_finalize "$TS_HELPER_MKFDS ro-regular-file...doesn't report its pid" + fi + + "$TS_HELPER_MKFDS" udp 3 4 server-port=34567 client-port=23456 server-do-bind=1 client-do-bind=1 client-do-connect=1 > "${FIFO}" & + if ! read PID3 < "${FIFO}"; then + kill -CONT "${PID0}" "${PID1}" "${PID2}" + wait "${PID0}" "${PID1}" "${PID2}" + rm "${FIFO}" + ts_finalize "$TS_HELPER_MKFDS udp...doesn't report its pid" + fi + + "$TS_HELPER_MKFDS" udp6 3 4 lite=1 server-port=34567 client-port=23456 server-do-bind=1 client-do-bind=1 client-do-connect=1 > "${FIFO}" & + if ! read PID4 < "${FIFO}"; then + kill -CONT "${PID0}" "${PID1}" "${PID2}" "${PID3}" + wait "${PID0}" "${PID1}" "${PID2}" "${PID3}" + rm "${FIFO}" + ts_finalize "$TS_HELPER_MKFDS udp6 lite=1...doesn't report its pid" + fi OPT='--inet' echo "# $OPT" @@ -87,6 +118,7 @@ ts_cd "$TS_OUTDIR" kill -CONT "${PID0}" "${PID1}" "${PID2}" "${PID3}" "${PID4}" wait "${PID0}" "${PID1}" "${PID2}" "${PID3}" "${PID4}" + rm "${FIFO}" } > "$TS_OUTPUT" 2>&1 ts_finalize |