From b572a286d5d24cdb1669baa3f867317bdb534b1a Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Sat, 19 Nov 2016 11:14:49 +0000
Subject: 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
---
 tests/tail-2/pipe-f.sh | 5 +----
 tests/tail-2/retry.sh  | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh
index 82364dacc..3c9826618 100755
--- a/tests/tail-2/pipe-f.sh
+++ b/tests/tail-2/pipe-f.sh
@@ -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
 
diff --git a/tests/tail-2/retry.sh b/tests/tail-2/retry.sh
index 782992356..1ab09ddac 100755
--- a/tests/tail-2/retry.sh
+++ b/tests/tail-2/retry.sh
@@ -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
 
-- 
cgit v1.2.3-54-g00ecf