From 2f08bc1a5c3a2171339aebcc8f7896954eca4221 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 17 Sep 2021 14:33:40 -0700 Subject: [PATCH] Increase timeouts in Test_runWithTimeout Under load sometimes the 1 millisecond timeouts are not run before a 1 second sleep finishes, or `echo foo` is not run before a 1 second timeoutt. Increase the long sleeps and timeouts to 10 seconds. This doesn't affect normal test runtime as the command should timeout after 1 millisecond. Bug: 199207577 Test: Test_runWithTimeout Change-Id: I31166850a473b9cde37906a62d026580e7a7bd3f --- cmd/run_with_timeout/run_with_timeout_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/run_with_timeout/run_with_timeout_test.go b/cmd/run_with_timeout/run_with_timeout_test.go index ed6ec11e7..6729e6165 100644 --- a/cmd/run_with_timeout/run_with_timeout_test.go +++ b/cmd/run_with_timeout/run_with_timeout_test.go @@ -50,7 +50,7 @@ func Test_runWithTimeout(t *testing.T) { args: args{ command: "echo", args: []string{"foo"}, - timeout: 1 * time.Second, + timeout: 10 * time.Second, }, wantStdout: "foo\n", }, @@ -58,7 +58,7 @@ func Test_runWithTimeout(t *testing.T) { name: "timed out", args: args{ command: "sh", - args: []string{"-c", "sleep 1 && echo foo"}, + args: []string{"-c", "sleep 10 && echo foo"}, timeout: 1 * time.Millisecond, }, wantStderr: ".*: process timed out after .*\n", @@ -68,7 +68,7 @@ func Test_runWithTimeout(t *testing.T) { name: "on_timeout command", args: args{ command: "sh", - args: []string{"-c", "sleep 1 && echo foo"}, + args: []string{"-c", "sleep 10 && echo foo"}, timeout: 1 * time.Millisecond, onTimeoutCmd: "echo bar", },