tests: (lsfd) don't hardcode the inode number of netns in the expected output

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/tests/expected/lsfd/mkfds-netns b/tests/expected/lsfd/mkfds-netns
index 3df8ce7f7d624d1f76382ccbdfccd8651c67fcd7..4b4c0acad14d9ae96f60694fa82fd5be60a01d7b 100644 (file)
--- 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 71bf0d012d77bf892613b1f77fb943afb2825630..24e926561998495829b2b4a4ef5e22fd930d2df0 100755 (executable)
--- 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