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 <ruediger.meier@ga-group.nl>

diff --git a/tests/functions.sh b/tests/functions.sh
index 004ef0f3c45ec817d7a447ed33c8f4cd688c57b6..376e78929f60bfe5f6d491273c8095c42ec9aff3 100644 (file)
--- 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"