From 3a70f9d422e2d47dad0d8d5825832dd7f85f049a Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Thu, 5 Mar 2015 22:01:49 -0800 Subject: [PATCH] integ-cli: fix test requiring scratch TestRunCidFileCleanupIfEmpty fails on windows/mac because the test runs the command `docker run scratch` and it gives the following error: Unable to find image 'scratch:latest' locally Pulling repository scratch 511136ea3c5a: Download complete FATA[0004] 'scratch' is a reserved name I am not entirely sure if this is a test issue or not but I had a quick workaround by creating another image using `FROM scratch` and using that. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_run_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 76ec09f16d..11520d29e5 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2289,11 +2289,12 @@ func TestRunCidFileCleanupIfEmpty(t *testing.T) { } defer os.RemoveAll(tmpDir) tmpCidFile := path.Join(tmpDir, "cid") - cmd := exec.Command(dockerBinary, "run", "--cidfile", tmpCidFile, "scratch") + cmd := exec.Command(dockerBinary, "run", "--cidfile", tmpCidFile, "emptyfs") out, _, err := runCommandWithOutput(cmd) - t.Log(out) if err == nil { - t.Fatal("Run without command must fail") + t.Fatalf("Run without command must fail. out=%s", out) + } else if !strings.Contains(out, "No command specified") { + t.Fatalf("Run without command failed with wrong output. out=%s\nerr=%v", out, err) } if _, err := os.Stat(tmpCidFile); err == nil {