From ae03b006a6ad113ef3674493b83b82cb43ba748e Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 22 Jan 2018 18:09:47 -0500 Subject: [PATCH] Fix merge conflict Signed-off-by: Daniel Nephin --- e2e/container/attach_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/container/attach_test.go b/e2e/container/attach_test.go index d26cae90ff..3e7d0ed244 100644 --- a/e2e/container/attach_test.go +++ b/e2e/container/attach_test.go @@ -4,6 +4,7 @@ import ( "strings" "testing" + "github.com/docker/cli/e2e/internal/fixtures" "github.com/gotestyourself/gotestyourself/icmd" ) @@ -19,7 +20,7 @@ func TestAttachExitCode(t *testing.T) { func runBackgroundContainsWithExitCode(t *testing.T, exitcode int) string { 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) return strings.TrimSpace(result.Stdout()) }