kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #36471 from yongtang/03022018-improvement 

Improvement in integration tests
This commit is contained in:
Vincent Demeester 2018-03-05 17:54:09 +01:00 committed by GitHub
parent 61cb026e7e 6ab465804b
commit 3af9b1d395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration/container/logs_test.go
View File

@ -20,7 +20,6 @@ func TestLogsFollowTailEmpty(t *testing.T) {
ctx := context.Background() ctx := context.Background()
id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000")) id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
defer client.ContainerRemove(ctx, id, types.ContainerRemoveOptions{Force: true})
logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"}) logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
if logs != nil { if logs != nil {

12
integration/image/commit_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/docker/docker/api/types" "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/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -16,10 +16,9 @@ func TestCommitInheritsEnv(t *testing.T) {
client := request.NewAPIClient(t) client := request.NewAPIClient(t)
ctx := context.Background() ctx := context.Background()
createResp1, err := client.ContainerCreate(ctx, &container.Config{Image: "busybox"}, nil, nil, "") cID1 := container.Create(t, ctx, client)
require.NoError(t, err)
commitResp1, err := client.ContainerCommit(ctx, createResp1.ID, types.ContainerCommitOptions{ commitResp1, err := client.ContainerCommit(ctx, cID1, types.ContainerCommitOptions{
Changes: []string{"ENV PATH=/bin"}, Changes: []string{"ENV PATH=/bin"},
Reference: "test-commit-image", Reference: "test-commit-image",
}) })
@ -31,10 +30,9 @@ func TestCommitInheritsEnv(t *testing.T) {
expectedEnv1 := []string{"PATH=/bin"} expectedEnv1 := []string{"PATH=/bin"}
assert.Equal(t, expectedEnv1, image1.Config.Env) assert.Equal(t, expectedEnv1, image1.Config.Env)
createResp2, err := client.ContainerCreate(ctx, &container.Config{Image: image1.ID}, nil, nil, "") cID2 := container.Create(t, ctx, client, container.WithImage(image1.ID))
require.NoError(t, err)
commitResp2, err := client.ContainerCommit(ctx, createResp2.ID, types.ContainerCommitOptions{ commitResp2, err := client.ContainerCommit(ctx, cID2, types.ContainerCommitOptions{
Changes: []string{"ENV PATH=/usr/bin:$PATH"}, Changes: []string{"ENV PATH=/usr/bin:$PATH"},
Reference: "test-commit-image", Reference: "test-commit-image",
}) })

7
integration/internal/container/ops.go
View File

@ -22,6 +22,13 @@ func WithLinks(links ...string) func(*TestContainerConfig) {
} }
} }
// WithImage sets the image of the container
func WithImage(image string) func(*TestContainerConfig) {
return func(c *TestContainerConfig) {
c.Config.Image = image
}
}
// WithCmd sets the comannds of the container // WithCmd sets the comannds of the container
func WithCmd(cmds ...string) func(*TestContainerConfig) { func WithCmd(cmds ...string) func(*TestContainerConfig) {
return func(c *TestContainerConfig) { return func(c *TestContainerConfig) {