diff options
author | Daniel Nephin <dnephin@docker.com> | 2018-03-13 15:28:34 -0400 |
---|---|---|
committer | Daniel Nephin <dnephin@docker.com> | 2018-03-16 11:03:43 -0400 |
commit | 6be0f709830113966f295401327b027ec2f0bbca (patch) | |
tree | c1430a38be5fac52d9c3b9e06b15e7db59025da5 /daemon/oci_linux_test.go | |
parent | ef01dea8935932486f03a37069720987e805dce6 (diff) | |
download | docker-6be0f709830113966f295401327b027ec2f0bbca.tar.gz |
Automated migration using
gty-migrate-from-testify --ignore-build-tags
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Diffstat (limited to 'daemon/oci_linux_test.go')
-rw-r--r-- | daemon/oci_linux_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/daemon/oci_linux_test.go b/daemon/oci_linux_test.go index f6bda79745..5f2731b8d6 100644 --- a/daemon/oci_linux_test.go +++ b/daemon/oci_linux_test.go @@ -8,8 +8,8 @@ import ( "github.com/docker/docker/daemon/config" "github.com/docker/docker/oci" "github.com/docker/docker/pkg/idtools" - - "github.com/stretchr/testify/assert" + "github.com/gotestyourself/gotestyourself/assert" + is "github.com/gotestyourself/gotestyourself/assert/cmp" ) // TestTmpfsDevShmNoDupMount checks that a user-specified /dev/shm tmpfs @@ -36,17 +36,17 @@ func TestTmpfsDevShmNoDupMount(t *testing.T) { // Mimick the code flow of daemon.createSpec(), enough to reproduce the issue ms, err := d.setupMounts(c) - assert.NoError(t, err) + assert.Check(t, err) ms = append(ms, c.IpcMounts()...) tmpfsMounts, err := c.TmpfsMounts() - assert.NoError(t, err) + assert.Check(t, err) ms = append(ms, tmpfsMounts...) s := oci.DefaultSpec() err = setMounts(&d, &s, c, ms) - assert.NoError(t, err) + assert.Check(t, err) } // TestIpcPrivateVsReadonly checks that in case of IpcMode: private @@ -70,19 +70,19 @@ func TestIpcPrivateVsReadonly(t *testing.T) { // We can't call createSpec() so mimick the minimal part // of its code flow, just enough to reproduce the issue. ms, err := d.setupMounts(c) - assert.NoError(t, err) + assert.Check(t, err) s := oci.DefaultSpec() s.Root.Readonly = c.HostConfig.ReadonlyRootfs err = setMounts(&d, &s, c, ms) - assert.NoError(t, err) + assert.Check(t, err) // Find the /dev/shm mount in ms, check it does not have ro for _, m := range s.Mounts { if m.Destination != "/dev/shm" { continue } - assert.Equal(t, false, inSlice(m.Options, "ro")) + assert.Check(t, is.Equal(false, inSlice(m.Options, "ro"))) } } |