tests: tail-2/inotify-rotate: fix a false failure on NFS

* tests/tail-2/inotify-rotate.sh: Avoid a subshell with bash,
which in turn causes the `kill` to be ineffective to the tail
processes (as the SIGTERM is sent to the subshell which doesn't
propagate the signal on to its children).  On NFS the test
cleanup will then fail as there will be .nfs files maintained
in the directory for the files still opened by the tail processes.
Reported by Bernhard Voelker.
This commit is contained in:
Pádraig Brady committed 2013-02-10 05:05:38 +00:00
1 parent 54deb54db9
commit 71ab11eac1
1 file changed
+3 -1
+3 -1
View File
@@ -47,7 +47,8 @@ for i in $(seq 50); do
# Normally less than a second is required here, but with heavy load
# and a lot of disk activity, even 20 seconds is insufficient, which
# leads to this timeout killing tail before the "ok" is written below.
:>k && :>x && timeout 40 tail -F k > out 2>&1 &
:>k && :>x || framework_failure_ failed to initialize files
timeout 40 tail -F k > out 2>&1 &
pid=$!
sleep .1
echo b > k;
@@ -65,4 +66,5 @@ for i in $(seq 50); do
test $found = 0 && { cat out; fail_ failed to detect echoed '"ok"'; }
done
wait
Exit $fail