From 7594078fbe0aec6c7a0f8369bf5ecaa409145102 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Wed, 21 May 2014 11:29:11 -0700 Subject: [PATCH] for perms checking tests, create files from Go and remove them from git Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) Upstream-commit: bb431a719008ae183179d9d71090bd1224d61480 Component: engine --- .../TestAdd/SingleFileToRoot/test_file | 0 .../TestAdd/WholeDirToRoot/test_dir/test_file | 0 .../integration-cli/docker_cli_build_test.go | 24 +++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 components/engine/integration-cli/build_tests/TestAdd/SingleFileToRoot/test_file delete mode 100644 components/engine/integration-cli/build_tests/TestAdd/WholeDirToRoot/test_dir/test_file diff --git a/components/engine/integration-cli/build_tests/TestAdd/SingleFileToRoot/test_file b/components/engine/integration-cli/build_tests/TestAdd/SingleFileToRoot/test_file deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/engine/integration-cli/build_tests/TestAdd/WholeDirToRoot/test_dir/test_file b/components/engine/integration-cli/build_tests/TestAdd/WholeDirToRoot/test_dir/test_file deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 455264d9f8..ed61afe7c4 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -57,8 +57,13 @@ func TestBuildSixtySteps(t *testing.T) { } func TestAddSingleFileToRoot(t *testing.T) { - buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd") - buildCmd := exec.Command(dockerBinary, "build", "-t", "testaddimg", "SingleFileToRoot") + buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd", "SingleFileToRoot") + f, err := os.OpenFile(filepath.Join(buildDirectory, "test_file"), os.O_CREATE, 0644) + if err != nil { + t.Fatal(err) + } + f.Close() + buildCmd := exec.Command(dockerBinary, "build", "-t", "testaddimg", ".") buildCmd.Dir = buildDirectory out, exitCode, err := runCommandWithOutput(buildCmd) errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err)) @@ -137,8 +142,17 @@ func TestAddDirContentToExistDir(t *testing.T) { } func TestAddWholeDirToRoot(t *testing.T) { - buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd") - buildCmd := exec.Command(dockerBinary, "build", "-t", "testaddimg", "WholeDirToRoot") + buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd", "WholeDirToRoot") + test_dir := filepath.Join(buildDirectory, "test_dir") + if err := os.MkdirAll(test_dir, 0755); err != nil { + t.Fatal(err) + } + f, err := os.OpenFile(filepath.Join(test_dir, "test_file"), os.O_CREATE, 0644) + if err != nil { + t.Fatal(err) + } + f.Close() + buildCmd := exec.Command(dockerBinary, "build", "-t", "testaddimg", ".") buildCmd.Dir = buildDirectory out, exitCode, err := runCommandWithOutput(buildCmd) errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err)) @@ -192,7 +206,7 @@ func TestBuildWithInaccessibleFilesInContext(t *testing.T) { // check if we've detected the failure before we started building if !strings.Contains(out, "no permission to read from ") { - t.Fatalf("output should've contained the string: no permission to read from ") + t.Fatalf("output should've contained the string: no permission to read from but contained: %s", out) } if !strings.Contains(out, "Error checking context is accessible") {