0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite TestBuildAddEtcToRoot 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:26:51 +04:00
parent c58391bbd0
commit 570f1153b9
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile
View file

@ -1,2 +0,0 @@
FROM scratch
ADD . /

21
integration-cli/docker_cli_build_test.go
View file

@ -301,16 +301,21 @@ func TestBuildAddWholeDirToRoot(t *testing.T) {
logDone("build - add whole directory to root")
}
// Testing #5941
func TestBuildAddEtcToRoot(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "EtcToRoot")
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")
name := "testaddetctoroot"
defer deleteImages(name)
ctx, err := fakeContext(`FROM scratch
ADD . /`,
map[string]string{
"etc/test_file": "test1",
})
if err != nil {
t.Fatal(err)
}
if _, err := buildImageFromContext(name, ctx, true); err != nil {
t.Fatal(err)
}
deleteImages("testaddimg")
logDone("build - add etc directory to root")
}