Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2018-01-22 18:09:47 -05:00
parent fbb9de2cfc
commit ae03b006a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/container/attach_test.go
View File

@ -4,6 +4,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/gotestyourself/gotestyourself/icmd" "github.com/gotestyourself/gotestyourself/icmd"
) )
@ -19,7 +20,7 @@ func TestAttachExitCode(t *testing.T) {
func runBackgroundContainsWithExitCode(t *testing.T, exitcode int) string { func runBackgroundContainsWithExitCode(t *testing.T, exitcode int) string {
result := icmd.RunCmd(shell(t, result := icmd.RunCmd(shell(t,
"docker run -d -i --rm %s sh -c 'read; exit %d'", alpineImage, exitcode)) "docker run -d -i --rm %s sh -c 'read; exit %d'", fixtures.AlpineImage, exitcode))
result.Assert(t, icmd.Success) result.Assert(t, icmd.Success)
return strings.TrimSpace(result.Stdout()) return strings.TrimSpace(result.Stdout())
} }