From 57d34241fdff146eaeae748c959940489335ed2a Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Sat, 14 Feb 2015 02:44:56 -0800 Subject: [PATCH] integration-cli: fix test to use busybox outside container Fixes TestRmiForceWithExistingContainers test to make it use `busybox` image rather than /docker-busybox hardcoded path and rebuilding image. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_rmi_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_rmi_test.go b/integration-cli/docker_cli_rmi_test.go index 63d9f92983..e14d782a90 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -102,7 +102,12 @@ func TestRmiTagWithExistingContainers(t *testing.T) { func TestRmiForceWithExistingContainers(t *testing.T) { image := "busybox-clone" - if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "build", "--no-cache", "-t", image, "/docker-busybox")); err != nil { + + cmd := exec.Command(dockerBinary, "build", "--no-cache", "-t", image, "-") + cmd.Stdin = strings.NewReader(`FROM busybox +MAINTAINER foo`) + + if out, _, err := runCommandWithOutput(cmd); err != nil { t.Fatalf("Could not build %s: %s, %v", image, out, err) }