tests: fix recent tail-2 test regressions

* tests/tail-2/pipe-f.sh: Avoid issue with readable
directories on BSD systems.
* tests/tail-2/retry.sh: Likewise.
Reported by Assaf Gordon
This commit is contained in:
Pádraig Brady 2016-11-19 11:14:49 +00:00
parent 01971c0e3f
commit b572a286d5
2 changed files with 6 additions and 5 deletions

View File

@ -23,13 +23,10 @@ echo oo > exp || framework_failure_
echo foo | timeout 10 tail -f -c3 > out || fail=1
compare exp out || fail=1
cat <<\EOF > exp
cat <<\EOF > exp || framework_failure_
==> standard input <==
ar
==> missing <==
EOF
mkdir missing || framework_failure_
echo bar | returns_ 1 timeout 10 tail -f -c3 - missing > out || fail=1
compare exp out || fail=1

View File

@ -148,6 +148,7 @@ returns_ 1 tail $mode --follow=descriptor missing >out 2>&1 || fail=1
[ "$(countlines_)" = 2 ] || { fail=1; cat out; }
grep -F 'cannot open' out || { fail=1; cat out; }
grep -F 'no files remaining' out || { fail=1; cat out; }
rm -f out || framework_failure_
# === Test:
# Likewise for --follow=name (without --retry).
@ -155,10 +156,12 @@ returns_ 1 tail $mode --follow=name missing >out 2>&1 || fail=1
[ "$(countlines_)" = 2 ] || { fail=1; cat out; }
grep -F 'cannot open' out || { fail=1; cat out; }
grep -F 'no files remaining' out || { fail=1; cat out; }
rm -f out || framework_failure_
# === Test:
# Ensure that tail -F retries when the file is initially untailable.
mkdir untailable
if ! cat . >/dev/null; then
mkdir untailable || framework_failure_
timeout 10 \
tail $mode $fastpoll -F untailable >out 2>&1 & pid=$!
# Wait for "cannot open" error.
@ -172,6 +175,7 @@ grep -F 'cannot follow' out || { fail=1; cat out; }
grep -F 'has become accessible' out || { fail=1; cat out; }
grep -F 'foo' out || { fail=1; cat out; }
rm -fd untailable out || framework_failure_
fi
done