From 55a680c17f258156006cfffd591c6a37864eaa04 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Wed, 7 Mar 2018 17:58:23 +0100 Subject: tests: dont't timeout flock The only situation where we would block endless is if another parallel test has the lock and hangs for another reason. This means that the other test would still keep hanging even if we timeout here. The user would have to interrupt the other test or the whole test-suite anyways. Note that we would certainly run into any timeout when using --parallel=200, so that all scsi tests start the same time. Signed-off-by: Ruediger Meier --- tests/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/functions.sh') diff --git a/tests/functions.sh b/tests/functions.sh index 004ef0f3c..376e78929 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -744,7 +744,7 @@ function ts_lock { fd=$(ts_find_free_fd) || ts_skip "failed to find lock fd" eval "exec $fd>$lockfile" - flock --exclusive --timeout 30 $fd || ts_skip "failed to lock $resource" + flock --exclusive "$fd" || ts_skip "failed to lock $resource" TS_LOCKFILE_FD["$resource"]="$fd" ###echo "[$$ $TS_TESTNAME] Locked $resource" -- cgit v1.2.3-55-g7522