From: Masatake YAMATO <yamato@redhat.com>
Date: Thu, 7 Dec 2023 19:35:29 +0000 (+0900)
Subject: tests: (lslcoks) insert a sleep between taking a lock and running lslocks
X-Git-Tag: v2.40-rc1~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bc52cc04ce12decd2ea1b00dace1edcfb90682f;p=thirdparty%2Futil-linux.git

tests: (lslcoks) insert a sleep between taking a lock and running lslocks

Close #2624.

It appears that there is a time lag between locking and its visibility
in /proc/locks.  See the unstbale results of errors I observed in
https://github.com/util-linux/util-linux/pull/2629.

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

diff --git a/tests/ts/lslocks/lslocks b/tests/ts/lslocks/lslocks
index a9ef69a35e..912fac83bb 100755
--- a/tests/ts/lslocks/lslocks
+++ b/tests/ts/lslocks/lslocks
@@ -53,6 +53,14 @@ OFD_METHODS=(
     lease-w
 )
 
+SLEEP()
+{
+    # It appears that there is a time lag between locking and its
+    # visibility in /proc/locks.  See the unstbale results of errors I
+    # observed in https://github.com/util-linux/util-linux/pull/2629.
+    sleep 1
+}
+
 DFD=18
 COLS_WITH_HOLDERS=COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS
 run_lslocks()
@@ -63,6 +71,8 @@ run_lslocks()
 	rm -f "${FILE}"
 	coproc MKFDS { "$TS_HELPER_MKFDS" make-regular-file $FD file="$FILE" lock=$m; }
 	if read -r -u "${MKFDS[0]}" PID; then
+	    SLEEP
+
 	    "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o "${COLS}"
 	    echo "# $m + ${COLS} + ${OPTS}": $?
 	    "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o PATH | sed -e 's#.*\('"$FILE0"'\)--[0-9]\+ *$#\1#'
@@ -81,6 +91,7 @@ run_lslocks_with_co_holders()
     {
 	rm -f "${FILE}"
 	coproc MKFDS { "$TS_HELPER_MKFDS" make-regular-file $FD file="$FILE" lock=$m dupfd=$DFD; }
+	SLEEP
 	if read -r -u "${MKFDS[0]}" PID; then
 	    "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o "${COLS_WITH_HOLDERS}" | sed -e "s/${PID},/1,/g"
 	    echo "# $m + ${COLS_WITH_HOLDERS} + ${OPTS}": ${PIPESTATUS[0]}