From 55a9ad3ed3d63af2fb9030ff71be20bcbc1be42d Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 16 Apr 2023 06:48:09 +0900 Subject: [PATCH] tests: (lsfd) don't hardcode the inode number of netns in the expected output Signed-off-by: Masatake YAMATO --- tests/expected/lsfd/mkfds-netns | 6 +++--- tests/ts/lsfd/mkfds-netns | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/expected/lsfd/mkfds-netns b/tests/expected/lsfd/mkfds-netns index 3df8ce7f7d..4b4c0acad1 100644 --- a/tests/expected/lsfd/mkfds-netns +++ b/tests/expected/lsfd/mkfds-netns @@ -1,4 +1,4 @@ net -net:[4026531840] == net:[4026531840]: 0 -net:[4026531840] == net:[4026531840]: 0 -net:[4026531840] == net:[4026531840]: 0 +NAME_FD == NAME_NS: 0 +NAME_FD == net:[INO_FD]: 0 +NAME_FD == net:[INO_NS]: 0 diff --git a/tests/ts/lsfd/mkfds-netns b/tests/ts/lsfd/mkfds-netns index 71bf0d012d..24e9265619 100755 --- a/tests/ts/lsfd/mkfds-netns +++ b/tests/ts/lsfd/mkfds-netns @@ -42,14 +42,23 @@ INO_NS= INO_FD=$( "${TS_CMD_LSFD}" -n -oINODE -p "${PID}" -Q "(FD == $FD)") INO_NS=$( "${TS_CMD_LSFD}" -n -oINODE -p "${PID}" -Q '(ASSOC == "net")') - [[ "$NAME_FD" = "$NAME_NS" ]] - echo "$NAME_FD" == "$NAME_NS": $? + if [[ "$NAME_FD" = "$NAME_NS" ]]; then + echo "NAME_FD" == "NAME_NS": $? + else + echo "NAME_FD: $NAME_FD" == "NAME_NS: $NAME_NS": $? + fi - [[ "$NAME_FD" = "net:[$INO_FD]" ]] - echo "$NAME_FD" == "net:[$INO_FD]": $? + if [[ "$NAME_FD" = "net:[$INO_FD]" ]]; then + echo "NAME_FD" == "net:[INO_FD]": $? + else + echo "NAME_FD: $NAME_FD" == "net:[INO_FD: $INO_FD]": $? + fi - [[ "$NAME_FD" = "net:[$INO_NS]" ]] - echo "$NAME_FD" == "net:[$INO_NS]": $? + if [[ "$NAME_FD" = "net:[$INO_NS]" ]]; then + echo "NAME_FD" == "net:[INO_NS]": $? + else + echo "NAME_FD: $NAME_FD" == "net:[INO_NS: $INO_NS]": $? + fi kill -CONT ${PID} fi -- 2.47.3