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

Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup

Browse Source 
integ-cli: Add a few missing context cleanups
Upstream-commit: 082b7726e22c4e7e161cb715158675ed24fc3e4c
Component: engine
This commit is contained in:
Jessie Frazelle
2015-02-26 11:05:30 -08:00
parent 0edfd99487 ba75e02a5f
commit 272eeccbe2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2563,6 +2563,10 @@ func TestBuildConditionalCache(t *testing.T) {
ctx, err := fakeContext(dockerfile, map[string]string{
"foo": "hello",
})
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
id1, err := buildImageFromContext(name, ctx, true)
if err != nil {
@ -3453,6 +3457,8 @@ func TestBuildDockerignoringDockerfile(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
if _, err = buildImageFromContext(name, ctx, true); err != nil {
t.Fatalf("Didn't ignore Dockerfile correctly:%s", err)
}
@ -3483,6 +3489,8 @@ func TestBuildDockerignoringRenamedDockerfile(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
if _, err = buildImageFromContext(name, ctx, true); err != nil {
t.Fatalf("Didn't ignore MyDockerfile correctly:%s", err)
}
@ -3803,6 +3811,8 @@ RUN [ "$abc" = "\\\"foo\\\"" ]
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
_, err = buildImageFromContext(name, ctx, true)
if err != nil {
t.Fatal(err)