From 08a10f936b4b5a69d3be6d320499c025a399fddb Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Tue, 17 Jun 2014 11:04:07 +0400 Subject: [PATCH] Move TestBuildFailsDockerfileEmpty to integration-cli Docker-DCO-1.1-Signed-off-by: Alexandr Morozov (github: LK4D4) --- integration-cli/docker_cli_build_test.go | 14 ++++++++++++++ integration/buildfile_test.go | 8 -------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 8b46357a80..bebb691bd2 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -1273,3 +1273,17 @@ func TestBuildFails(t *testing.T) { } logDone("build - fails") } + +func TestBuildFailsDockerfileEmpty(t *testing.T) { + name := "testbuildfails" + defer deleteImages(name) + _, err := buildImage(name, ``, true) + if err != nil { + if !strings.Contains(err.Error(), "Dockerfile cannot be empty") { + t.Fatalf("Wrong error %v, must be about empty Dockerfile", err) + } + } else { + t.Fatal("Error must not be nil") + } + logDone("build - fails with empty dockerfile") +} diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go index 833d2b6789..231aa9975f 100644 --- a/integration/buildfile_test.go +++ b/integration/buildfile_test.go @@ -413,14 +413,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u return image, err } -func TestBuildFailsDockerfileEmpty(t *testing.T) { - _, err := buildImage(testContextTemplate{``, nil, nil}, t, nil, true) - - if err != server.ErrDockerfileEmpty { - t.Fatal("Expected: %v, got: %v", server.ErrDockerfileEmpty, err) - } -} - func TestBuildOnBuildTrigger(t *testing.T) { _, err := buildImage(testContextTemplate{` from {IMAGE}