summaryrefslogtreecommitdiff
path: root/integration/image/commit_test.go
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@docker.com>2018-03-13 15:28:34 -0400
committerDaniel Nephin <dnephin@docker.com>2018-03-16 11:03:43 -0400
commit6be0f709830113966f295401327b027ec2f0bbca (patch)
treec1430a38be5fac52d9c3b9e06b15e7db59025da5 /integration/image/commit_test.go
parentef01dea8935932486f03a37069720987e805dce6 (diff)
downloaddocker-6be0f709830113966f295401327b027ec2f0bbca.tar.gz
Automated migration using
gty-migrate-from-testify --ignore-build-tags Signed-off-by: Daniel Nephin <dnephin@docker.com>
Diffstat (limited to 'integration/image/commit_test.go')
-rw-r--r--integration/image/commit_test.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go
index 39fc956db1..e13719b532 100644
--- a/integration/image/commit_test.go
+++ b/integration/image/commit_test.go
@@ -7,8 +7,8 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/integration/internal/container"
"github.com/docker/docker/integration/internal/request"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
+ "github.com/gotestyourself/gotestyourself/assert"
+ is "github.com/gotestyourself/gotestyourself/assert/cmp"
)
func TestCommitInheritsEnv(t *testing.T) {
@@ -22,13 +22,13 @@ func TestCommitInheritsEnv(t *testing.T) {
Changes: []string{"ENV PATH=/bin"},
Reference: "test-commit-image",
})
- require.NoError(t, err)
+ assert.NilError(t, err)
image1, _, err := client.ImageInspectWithRaw(ctx, commitResp1.ID)
- require.NoError(t, err)
+ assert.NilError(t, err)
expectedEnv1 := []string{"PATH=/bin"}
- assert.Equal(t, expectedEnv1, image1.Config.Env)
+ assert.Check(t, is.DeepEqual(expectedEnv1, image1.Config.Env))
cID2 := container.Create(t, ctx, client, container.WithImage(image1.ID))
@@ -36,10 +36,10 @@ func TestCommitInheritsEnv(t *testing.T) {
Changes: []string{"ENV PATH=/usr/bin:$PATH"},
Reference: "test-commit-image",
})
- require.NoError(t, err)
+ assert.NilError(t, err)
image2, _, err := client.ImageInspectWithRaw(ctx, commitResp2.ID)
- require.NoError(t, err)
+ assert.NilError(t, err)
expectedEnv2 := []string{"PATH=/usr/bin:/bin"}
- assert.Equal(t, expectedEnv2, image2.Config.Env)
+ assert.Check(t, is.DeepEqual(expectedEnv2, image2.Config.Env))
}