From aee982627874e9719bc151007b7e0144edd3963e Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Tue, 9 Jun 2015 11:33:44 +0100 Subject: tail: display consistent diagnostics upon file replacement * src/tail.c (recheck): Display diagnostices for replaced files even with reused inodes which is a common case. * tests/tail-2/F-vs-missing.sh: Use correct diagnostic in comment. * tests/tail-2/F-vs-rename.sh: Likewise. --- tests/tail-2/F-vs-missing.sh | 2 +- tests/tail-2/F-vs-rename.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/tail-2') diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail-2/F-vs-missing.sh index be20ee3b8..54fe30a88 100755 --- a/tests/tail-2/F-vs-missing.sh +++ b/tests/tail-2/F-vs-missing.sh @@ -48,7 +48,7 @@ for mode in '' '---disable-inotify'; do (cd missing && echo x > file) || framework_failure_ # Wait up to 12.7s for this to appear in the output: - # "tail: '...' has appeared; following end of new file" + # "tail: '...' has appeared; following new file" tail_re='has appeared' retry_delay_ check_tail_output .1 7 || { echo "$0: file: unexpected delay?"; cat out; fail=1; } diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail-2/F-vs-rename.sh index ee61a548b..06733fb41 100755 --- a/tests/tail-2/F-vs-rename.sh +++ b/tests/tail-2/F-vs-rename.sh @@ -53,7 +53,7 @@ for mode in '' '---disable-inotify'; do echo x > a # Wait up to 12.7s for this to appear in the output: - # "tail: '...' has appeared; following end of new file" + # "tail: '...' has appeared; following new file" tail_re='has appeared' retry_delay_ check_tail_output .1 7 || { echo "$0: a: unexpected delay?"; cat out; fail=1; } -- cgit v1.2.3-70-g09d2