diff options
| author | Pádraig Brady <P@draigBrady.com> | 2010-02-02 10:47:48 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2010-02-02 15:16:40 +0000 |
| commit | dd2253f49da057a677199b18b8673cc09bd1f2f5 (patch) | |
| tree | 2402459625a21d4fc8719d91958144cd51403049 /tests/dd | |
| parent | f53a0e1062e251baf709552cdde73ce4f6ccf6fb (diff) | |
| download | coreutils-dd2253f49da057a677199b18b8673cc09bd1f2f5.tar.xz | |
tests: fix various timeout races
Prompted by the continuous integration build failure at:
http://hydra.nixos.org/build/277485
* tests/misc/timeout: Set all expected timeouts to 1s and all
unexpected timeouts to 10s. In this way, tests normally proceed
quickly but may delay up to 10s before reporting failures.
* tests/ls/infloop: Likewise.
* tests/tail-2/pid: Likewise.
* tests/tail-2/pipe-f: Likewise.
* tests/tail-2/wait: Likewise.
* tests/dd/skip-seek-past-dev: Likewise.
Diffstat (limited to 'tests/dd')
| -rwxr-xr-x | tests/dd/skip-seek-past-dev | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/dd/skip-seek-past-dev b/tests/dd/skip-seek-past-dev index 6f6fbd2da..c5b7aab30 100755 --- a/tests/dd/skip-seek-past-dev +++ b/tests/dd/skip-seek-past-dev @@ -42,17 +42,17 @@ device=$(df -P --local . | tail -n1 | cut -d' ' -f1) || dev_size=$(get_device_size "$device") || skip_test_ "failed to determine size of $device" -# Don't use shell arithimetic as older version of dash use longs +# Don't use shell arithmetic as older versions of dash use longs DEV_OFLOW=$(expr $dev_size + 1) -timeout 1 dd bs=1 skip=$DEV_OFLOW count=0 status=noxfer < "$device" 2> err +timeout 10 dd bs=1 skip=$DEV_OFLOW count=0 status=noxfer < "$device" 2> err test "$?" = "1" || fail=1 echo "dd: \`standard input': cannot skip: Invalid argument 0+0 records in 0+0 records out" > err_ok || framework_failure compare err_ok err || fail=1 -timeout 1 dd bs=1 seek=$DEV_OFLOW count=0 status=noxfer > "$device" 2> err +timeout 10 dd bs=1 seek=$DEV_OFLOW count=0 status=noxfer > "$device" 2> err test "$?" = "1" || fail=1 echo "dd: \`standard output': cannot seek: Invalid argument 0+0 records in |