Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a437d6a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Increase timeouts in Test_runWithTimeout" am: e646717c am: 728105d7 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830674

Change-Id: Ia656caa16d83945586393f1f5cf8e04508dee0ae
parents 6db67ee4 728105d7

cmd/run_with_timeout/run_with_timeout_test.go

+3 −3
Original line number Diff line number Diff line
@@ -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",

			},