From 8922ee206c657797315db16fba564c25253cac85 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Fri, 17 Sep 2021 01:22:54 +0100 Subject: [PATCH] tests: fix rare false failure in tail-2/F-vs-rename This is wrong fix really, as only introducing delay I think. * tests/tail-2/F-vs-rename.sh: Avoid a rare false failure due to a race in the test. Now wait until tail has noticed that b is replaced before writing to a, so that the subsequent write of "y" to b will be displayed independently from current contents of b ("x"). --- tests/tail-2/F-vs-rename.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail-2/F-vs-rename.sh index 2305c13fe6..9313fd0b60 100755 --- a/tests/tail-2/F-vs-rename.sh +++ b/tests/tail-2/F-vs-rename.sh @@ -51,6 +51,11 @@ for mode in '' '---disable-inotify'; do tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || { cat out; fail=1; } + # Wait 12.7s for this diagnostic: + # tail: 'b' has been replaced; following new file + tail_re='replaced' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + echo x > a # Wait up to 12.7s for this to appear in the output: # "tail: '...' has appeared; following new file" -- 2.47.2