vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #16781 from brahmaroutu/pkg_integration_timeout

Browse source 
timeouts causing tests to fail differently. GCCGO CI.
This commit is contained in:
Vincent Demeester 2015-10-08 22:02:22 +02:00
commit 54a199952b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
integration/dockerCmd_utils_test.go
View file

@ -171,7 +171,7 @@ func (s *DockerCmdSuite) TestDockerCmdWithTimeout(c *check.C) {
{ {
"doesnotexists", "doesnotexists",
[]string{}, []string{},
5 * time.Millisecond, 100 * time.Millisecond,
`Command doesnotexists not found.`, `Command doesnotexists not found.`,
1, 1,
fmt.Errorf(`"" failed with errors: exit status 1 : "Command doesnotexists not found."`), fmt.Errorf(`"" failed with errors: exit status 1 : "Command doesnotexists not found."`),
@ -179,7 +179,7 @@ func (s *DockerCmdSuite) TestDockerCmdWithTimeout(c *check.C) {
{ {
dockerBinary, dockerBinary,
[]string{"an", "error"}, []string{"an", "error"},
5 * time.Millisecond, 100 * time.Millisecond,
`an error has occurred`, `an error has occurred`,
1, 1,
fmt.Errorf(`"an error" failed with errors: exit status 1 : "an error has occurred"`), fmt.Errorf(`"an error" failed with errors: exit status 1 : "an error has occurred"`),
@ -195,7 +195,7 @@ func (s *DockerCmdSuite) TestDockerCmdWithTimeout(c *check.C) {
{ {
dockerBinary, dockerBinary,
[]string{"run", "-ti", "ubuntu", "echo", "hello"}, []string{"run", "-ti", "ubuntu", "echo", "hello"},
5 * time.Millisecond, 100 * time.Millisecond,
"hello", "hello",
0, 0,
nil, nil,
@ -282,7 +282,7 @@ func (s *DockerCmdSuite) TestDockerCmdInDirWithTimeout(c *check.C) {
{ {
"doesnotexists", "doesnotexists",
[]string{}, []string{},
5 * time.Millisecond, 100 * time.Millisecond,
`Command doesnotexists not found.`, `Command doesnotexists not found.`,
1, 1,
fmt.Errorf(`"dir:%s" failed with errors: exit status 1 : "Command doesnotexists not found."`, tempFolder), fmt.Errorf(`"dir:%s" failed with errors: exit status 1 : "Command doesnotexists not found."`, tempFolder),
@ -290,7 +290,7 @@ func (s *DockerCmdSuite) TestDockerCmdInDirWithTimeout(c *check.C) {
{ {
dockerBinary, dockerBinary,
[]string{"an", "error"}, []string{"an", "error"},
5 * time.Millisecond, 100 * time.Millisecond,
`an error has occurred`, `an error has occurred`,
1, 1,
fmt.Errorf(`"dir:%s an error" failed with errors: exit status 1 : "an error has occurred"`, tempFolder), fmt.Errorf(`"dir:%s an error" failed with errors: exit status 1 : "an error has occurred"`, tempFolder),
@ -306,7 +306,7 @@ func (s *DockerCmdSuite) TestDockerCmdInDirWithTimeout(c *check.C) {
{ {
dockerBinary, dockerBinary,
[]string{"run", "-ti", "ubuntu", "echo", "hello"}, []string{"run", "-ti", "ubuntu", "echo", "hello"},
5 * time.Millisecond, 100 * time.Millisecond,
"hello", "hello",
0, 0,
nil, nil,