From dce5d008d97c4bd6290555b969ca23908416fdb4 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 8 Apr 2024 13:23:32 -0700 Subject: [PATCH] timeout.test: reduce flake. A (presumably overloaded) CI server saw the `exit 0` test time out. Given that several of these tests should just fail immediately, having a huge timeout isn't even a bad thing --- if we had a bug that caused us to report the correct status, but not until the timeout had _also_ expired, this would make that failure glaringly obvious. Aren't the other tests with 0.1s timeouts potentially flaky? Yes, obviously, but I'll worry about those if/when we see them in real life? (Because increasing those timeouts _would_ increase overall test time.) --- tests/timeout.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/timeout.test b/tests/timeout.test index 694540ae..6033c754 100755 --- a/tests/timeout.test +++ b/tests/timeout.test @@ -8,13 +8,13 @@ testcmd "times out" '.1 sleep 100 ; echo $?' '124\n' '' '' testcmd "failure" '-s MONKEY .1 sleep 100 2>/dev/null ; echo $?' '125\n' '' '' testcmd "early failure" '2>/dev/null ; echo $?' '125\n' '' '' -testcmd "can't execute" '.1 / 2>/dev/null ; echo $?' '126\n' '' '' -testcmd "can't find" '.1 /does/not/exist 2>/dev/null ; echo $?' '127\n' '' '' +testcmd "can't execute" '666 / 2>/dev/null ; echo $?' '126\n' '' '' +testcmd "can't find" '666 /does/not/exist 2>/dev/null ; echo $?' '127\n' '' '' testcmd "custom signal" '-s 3 .1 sleep 100; echo $?' '124\n' '' '' testcmd "killed" '-s 9 .1 sleep 100; echo $?' '137\n' '' '' testcmd "TERM" '-s TERM .1 sleep 100; echo $?' '124\n' '' '' -testcmd "exit 0" '.1 true ; echo $?' '0\n' '' '' -testcmd "exit 1" '.1 false ; echo $?' '1\n' '' '' +testcmd "exit 0" '666 true ; echo $?' '0\n' '' '' +testcmd "exit 1" '666 false ; echo $?' '1\n' '' '' testcmd "--preserve-status" '--preserve-status .1 sleep 100 ; echo $?' '143\n' '' '' testcmd "--preserve-status killed" '--preserve-status -s 9 .1 sleep 100 ; echo $?' '137\n' '' '' -- 2.44.0.478.gd926399ef9-goog