Merge pull request moby#27271 from tonistiigi/fix-test-timeout

LK4D4 · web-flow · commit 61753568f5e4 · 2016-10-11T09:24:13.000-07:00
Reduce TestRunCommandWithTimeoutKilled flakiness
diff --git a/pkg/integration/cmd/command_test.go b/pkg/integration/cmd/command_test.go
@@ -63,12 +63,12 @@ func TestRunCommandWithTimeoutKilled(t *testing.T) {
 		t.Skip("Needs porting to Windows")
 	}
 
-	command := []string{"sh", "-c", "while true ; do echo 1 ; sleep .1 ; done"}
-	result := RunCmd(Cmd{Command: command, Timeout: 500 * time.Millisecond})
+	command := []string{"sh", "-c", "while true ; do echo 1 ; sleep .5 ; done"}
+	result := RunCmd(Cmd{Command: command, Timeout: 1250 * time.Millisecond})
 	result.Assert(t, Expected{Timeout: true})
 
 	ones := strings.Split(result.Stdout(), "\n")
-	assert.Equal(t, len(ones), 6)
+	assert.Equal(t, len(ones), 4)
 }
 
 func TestRunCommandWithErrors(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ func TestRunCommandWithTimeoutKilled(t *testing.T) {`
`63`	`63`	`t.Skip("Needs porting to Windows")`
`64`	`64`	`}`
`65`	`65`
`66`		`- command := []string{"sh", "-c", "while true ; do echo 1 ; sleep .1 ; done"}`
`67`		`- result := RunCmd(Cmd{Command: command, Timeout: 500 * time.Millisecond})`
	`66`	`+ command := []string{"sh", "-c", "while true ; do echo 1 ; sleep .5 ; done"}`
	`67`	`+ result := RunCmd(Cmd{Command: command, Timeout: 1250 * time.Millisecond})`
`68`	`68`	`result.Assert(t, Expected{Timeout: true})`
`69`	`69`
`70`	`70`	`ones := strings.Split(result.Stdout(), "\n")`
`71`		`- assert.Equal(t, len(ones), 6)`
	`71`	`+ assert.Equal(t, len(ones), 4)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func TestRunCommandWithErrors(t *testing.T) {`