diff options
| -rwxr-xr-x | tests/tail-2/F-vs-missing | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/tail-2/F-vs-missing b/tests/tail-2/F-vs-missing index 35b103b99..d46a624a2 100755 --- a/tests/tail-2/F-vs-missing +++ b/tests/tail-2/F-vs-missing @@ -46,4 +46,19 @@ tail_re='has appeared' retry_delay_ check_tail_output .1 7 || kill -HUP $pid +cleanup() +{ + local delay="$1" + rm -rf missing || + { sleep $delay; return 1; } +} + +# Try repeatedly to remove the temporary directory. +# This is normally unnecessary, because the containing directory will +# be removed by code from init.sh. However, when this particular test +# is run on an NFS-mounted volume, sometimes init.sh's cleanup code +# fails because the directory is not yet really empty, perhaps because +# the tail process (reading missing/file) is not yet killed. +retry_delay_ cleanup .1 6 + Exit $fail |