From dd2253f49da057a677199b18b8673cc09bd1f2f5 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 2 Feb 2010 10:47:48 +0000
Subject: 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.
---
 tests/tail-2/pid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/tail-2/pid')

diff --git a/tests/tail-2/pid b/tests/tail-2/pid
index 53f9191e8..b1286df05 100755
--- a/tests/tail-2/pid
+++ b/tests/tail-2/pid
@@ -42,13 +42,13 @@ for inotify in ---disable-inotify ''; do
 
   # Ensure that tail --pid=PID exits with success status when PID is dead.
   # Use an unlikely-to-be-live PID
-  timeout 3 tail -f -s.1 --pid=$PID_T_MAX $inotify empty
+  timeout 10 tail -f -s.1 --pid=$PID_T_MAX $inotify empty
   ret=$?
   test $ret = 124 && skip_test_ "pid $PID_T_MAX present or tail too slow"
   test $ret = 0 || fail=1
 
   # Ensure tail doesn't wait for data when PID is dead
-  timeout 3 tail -f -s10 --pid=$PID_T_MAX $inotify empty
+  timeout 10 tail -f -s10 --pid=$PID_T_MAX $inotify empty
   test $? = 124 && fail=1
 done
 
-- 
cgit v1.2.3-70-g09d2