kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Rewrite TestBuildAddWholeDirToRoot to not use fixtures

Browse source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
This commit is contained in:
Alexandr Morozov 2014-09-22 21:36:43 +04:00
parent 570f1153b9
commit 0c899cefdd
2 changed files with 18 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
integration-cli/build_tests/TestAdd/WholeDirToRoot/Dockerfile
View file

@ -1,11 +0,0 @@
FROM busybox
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
RUN echo 'dockerio:x:1001:' >> /etc/group
RUN touch /exists
RUN chown dockerio.dockerio exists
ADD test_dir /test_dir
RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]
RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '-rw-r--r--' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

43
integration-cli/docker_cli_build_test.go
View file

@ -269,35 +269,28 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,
} }
func TestBuildAddWholeDirToRoot(t *testing.T) { func TestBuildAddWholeDirToRoot(t *testing.T) {
testDirName := "WholeDirToRoot" name := "testaddwholedirtoroot"
sourceDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd", testDirName) defer deleteImages(name)
buildDirectory, err := ioutil.TempDir("", "test-build-add") ctx, err := fakeContext(`FROM busybox
defer os.RemoveAll(buildDirectory) RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
RUN echo 'dockerio:x:1001:' >> /etc/group
err = copyWithCP(sourceDirectory, buildDirectory) RUN touch /exists
if err != nil { RUN chown dockerio.dockerio exists
t.Fatalf("failed to copy files to temporary directory: %s", err) ADD test_dir /test_dir
} RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]
buildDirectory = filepath.Join(buildDirectory, testDirName) RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
test_dir := filepath.Join(buildDirectory, "test_dir") RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '-rw-r--r--' ]
if err := os.MkdirAll(test_dir, 0755); err != nil { RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
t.Fatal(err) map[string]string{
} "test_dir/test_file": "test1",
f, err := os.OpenFile(filepath.Join(test_dir, "test_file"), os.O_CREATE, 0644) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
f.Close() if _, err := buildImageFromContext(name, ctx, true); err != nil {
out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", ".") t.Fatal(err)
errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
} }
deleteImages("testaddimg")
logDone("build - add whole directory to root") logDone("build - add whole directory to root")
} }