toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite TestBuildSixtySteps to not use fixtures

Browse Source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3824ec62e81d78db4dd36ffd64b17ef4c620b47f
Component: engine
This commit is contained in:
Alexandr Morozov
2014-09-22 18:18:19 +04:00
parent f783617844
commit 08a3014c75
3 changed files with 11 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
components/engine/integration-cli/build_tests/TestBuildSixtySteps/Dockerfile
View File

@ -1,60 +0,0 @@
FROM scratch
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /
ADD foo /

1
components/engine/integration-cli/build_tests/TestBuildSixtySteps/foo
View File

@ -1 +0,0 @@
a

20
components/engine/integration-cli/docker_cli_build_test.go
View File

@ -46,16 +46,18 @@ func TestBuildCacheADD(t *testing.T) {
}
func TestBuildSixtySteps(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildSixtySteps")
out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "foobuildsixtysteps", ".")
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 := "foobuildsixtysteps"
defer deleteImages(name)
ctx, err := fakeContext("FROM scratch\n"+strings.Repeat("ADD foo /\n", 60),
map[string]string{
"foo": "test1",
})
if err != nil {
t.Fatal(err)
}
if _, err := buildImageFromContext(name, ctx, true); err != nil {
t.Fatal(err)
}
deleteImages("foobuildsixtysteps")
logDone("build - build an image with sixty build steps")
}