summaryrefslogtreecommitdiff
path: root/integration/image/commit_test.go
diff options
context:
space:
mode:
authorYong Tang <yong.tang.github@outlook.com>2018-03-02 19:02:50 +0000
committerYong Tang <yong.tang.github@outlook.com>2018-03-02 19:03:59 +0000
commit6ab465804b0b8cec6c5ac278a21151d49e34885d (patch)
tree1fc51968ec94af180b53663824121456db575355 /integration/image/commit_test.go
parent135f815fb4b1c362c0b212e9f3dd3b0cea81616b (diff)
downloaddocker-6ab465804b0b8cec6c5ac278a21151d49e34885d.tar.gz
Improvement in integration tests
This fix adds several improvement: 1. No need for explicit ContainerRemove as it has been handled in setupTest() 2. Added `container.WithImage` helper function and used it in commit tests. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'integration/image/commit_test.go')
-rw-r--r--integration/image/commit_test.go12
1 files changed, 5 insertions, 7 deletions
diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go
index a515b706af..39fc956db1 100644
--- a/integration/image/commit_test.go
+++ b/integration/image/commit_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/integration/internal/container"
"github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -16,10 +16,9 @@ func TestCommitInheritsEnv(t *testing.T) {
client := request.NewAPIClient(t)
ctx := context.Background()
- createResp1, err := client.ContainerCreate(ctx, &container.Config{Image: "busybox"}, nil, nil, "")
- require.NoError(t, err)
+ cID1 := container.Create(t, ctx, client)
- commitResp1, err := client.ContainerCommit(ctx, createResp1.ID, types.ContainerCommitOptions{
+ commitResp1, err := client.ContainerCommit(ctx, cID1, types.ContainerCommitOptions{
Changes: []string{"ENV PATH=/bin"},
Reference: "test-commit-image",
})
@@ -31,10 +30,9 @@ func TestCommitInheritsEnv(t *testing.T) {
expectedEnv1 := []string{"PATH=/bin"}
assert.Equal(t, expectedEnv1, image1.Config.Env)
- createResp2, err := client.ContainerCreate(ctx, &container.Config{Image: image1.ID}, nil, nil, "")
- require.NoError(t, err)
+ cID2 := container.Create(t, ctx, client, container.WithImage(image1.ID))
- commitResp2, err := client.ContainerCommit(ctx, createResp2.ID, types.ContainerCommitOptions{
+ commitResp2, err := client.ContainerCommit(ctx, cID2, types.ContainerCommitOptions{
Changes: []string{"ENV PATH=/usr/bin:$PATH"},
Reference: "test-commit-image",
})