From d106277d458fc65f521165248e3e8cd4eb41a5f6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 2 Jul 2009 23:40:40 +0200 Subject: tests: tail-2/wait: don't fail when run as root * tests/tail-2/wait: Ensure that the unreadable file really is not readable before trying to run "tail -f" on it. --- tests/tail-2/wait | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/tail-2/wait b/tests/tail-2/wait index 7eee8b159..8f2f6107f 100755 --- a/tests/tail-2/wait +++ b/tests/tail-2/wait @@ -45,17 +45,20 @@ if test -n "$state"; then kill $pid fi -tail -s0.1 -f not_accessible & -pid=$! -sleep .5 -state=$(get_process_status_ $pid) - -if test -n "$state"; then - case $state in - S*) echo $0: process still active 1>&2; fail=1 ;; - *) ;; - esac - kill $pid +# Check if the file is really not accessible before use it. +if ! cat not_accessible; then + tail -s0.1 -f not_accessible & + pid=$! + sleep .5 + state=$(get_process_status_ $pid) + + if test -n "$state"; then + case $state in + S*) echo $0: process still active 1>&2; fail=1 ;; + *) ;; + esac + kill $pid + fi fi (tail -s0.1 -f here 2>tail.err) & -- cgit v1.2.3-54-g00ecf