bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: adjust delays to avoid false positives

Browse Source 
* tests/rm/dangling-symlink.sh: The effective delay was only
1.5s.  So delay before the operation, and increase the iteration
count by 1 to increase the delay to 6.3s.  This failure was
noticed once on a FreeBSD 10.2 x86_64 virtual machine.
* tests/dd/stats.sh: Remove quotes on sleep argument
to ensure arguments are accumulated appropriately.
* tests/du/move-dir-while-traversing.sh: sleep before operation,
to increase the effective delay from 1.6s to 3.2s.
* tests/tail-2/flush-initial.sh: Likewise.
* tests/tail-2/pipe-f2.sh: Sleep first so that the effective delay
matches the commented value.
This commit is contained in:
Pádraig Brady
2016-01-18 12:41:36 +00:00
parent cc05c3c16d
commit 3f02d93be2
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/dd/stats.sh
View File

@@ -67,7 +67,7 @@ done
progress_output() progress_output()
{ {
{ sleep "$1"; echo 1; } | dd bs=1 status=progress of=/dev/null 2>err { sleep $1; echo 1; } | dd bs=1 status=progress of=/dev/null 2>err
# Progress output should be for "byte copied", while final is "bytes ..." # Progress output should be for "byte copied", while final is "bytes ..."
grep 'byte copied' err grep 'byte copied' err
} }

2
tests/du/move-dir-while-traversing.sh
View File

@@ -81,7 +81,7 @@ trap '' TSTP
timeout 6 ./inotify-watch-for-dir-access.py $t/3/a/b > start-msg & pid=$! timeout 6 ./inotify-watch-for-dir-access.py $t/3/a/b > start-msg & pid=$!
# Wait for the watcher to start... # Wait for the watcher to start...
nonempty() { test -s start-msg || { sleep $1; return 1; }; } nonempty() { sleep $1; test -s start-msg; }
retry_delay_ nonempty .1 5 || fail=1 retry_delay_ nonempty .1 5 || fail=1
# The above watches for an IN_OPEN event on $t/3/a/b, # The above watches for an IN_OPEN event on $t/3/a/b,

8
tests/rm/dangling-symlink.sh
View File

@@ -31,15 +31,15 @@ cleanup_() { kill $pid 2>/dev/null && wait $pid; }
rm ---presume-input-tty dangle symlink & pid=$! rm ---presume-input-tty dangle symlink & pid=$!
# The buggy rm (fileutils-4.1.9) would hang here, waiting for input. # The buggy rm (fileutils-4.1.9) would hang here, waiting for input.
# Wait up to 3.1s for rm to remove the files # Wait up to 6.3s for rm to remove the files
check_files_removed() { check_files_removed() {
local delay="$1"
local present=0 local present=0
sleep $1
ls -l dangle > /dev/null 2>&1 && present=1 ls -l dangle > /dev/null 2>&1 && present=1
ls -l symlink > /dev/null 2>&1 && present=1 ls -l symlink > /dev/null 2>&1 && present=1
test $present = 1 && { sleep $delay; return 1; } || : test $present = 0
} }
retry_delay_ check_files_removed .1 5 || fail=1 retry_delay_ check_files_removed .1 6 || fail=1
cleanup_ cleanup_

5
tests/tail-2/flush-initial.sh
View File

@@ -34,9 +34,8 @@ tail $fastpoll -f in > out & pid=$!
tail_flush() tail_flush()
{ {
local delay="$1" local delay="$1"
sleep $delay
test -s out || test -s out
{ sleep "$delay"; return 1; }
} }
retry_delay_ tail_flush .1 5 || fail=1 retry_delay_ tail_flush .1 5 || fail=1

6
tests/tail-2/pipe-f2.sh
View File

@@ -32,11 +32,7 @@ fastpoll='-s.1 --max-unchanged-stats=1'
timeout 10 tail $fastpoll -f fifo > out & pid=$! timeout 10 tail $fastpoll -f fifo > out & pid=$!
check_tail_output() check_tail_output() { sleep $1; test -s out; }
{
local n_sec="$1"
test -s out || { sleep $n_sec; return 1; }
}
# Wait 12.7s for tail to write something. # Wait 12.7s for tail to write something.
retry_delay_ check_tail_output .1 7 || fail=1 retry_delay_ check_tail_output .1 7 || fail=1