Migrate to gotestyourself/assert

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

content/helpers_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/errdefs"
+	"github.com/gotestyourself/gotestyourself/assert"
+	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/opencontainers/go-digest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 type copySource struct {
@@ -63,9 +63,9 @@ func TestCopy(t *testing.T) {
 				testcase.source.size,
 				testcase.source.digest)
 
-			require.NoError(t, err)
-			assert.Equal(t, testcase.source.digest, testcase.writer.commitedDigest)
-			assert.Equal(t, testcase.expected, testcase.writer.String())
+			assert.NilError(t, err)
+			assert.Check(t, is.Equal(testcase.source.digest, testcase.writer.commitedDigest))
+			assert.Check(t, is.Equal(testcase.expected, testcase.writer.String()))
 		})
 	}
 }

content/local/store_test.go

@@ -21,8 +21,8 @@ import (
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/content/testsuite"
 	"github.com/containerd/containerd/testutil"
+	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
-	"github.com/stretchr/testify/require"
 )
 
 type memoryLabelStore struct {
@@ -339,11 +339,11 @@ func checkWrite(ctx context.Context, t checker, cs content.Store, dgst digest.Di
 
 func TestWriterTruncateRecoversFromIncompleteWrite(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "test-local-content-store-recover")
-	require.NoError(t, err)
+	assert.NilError(t, err)
 	defer os.RemoveAll(tmpdir)
 
 	cs, err := NewStore(tmpdir)
-	require.NoError(t, err)
+	assert.NilError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -354,24 +354,24 @@ func TestWriterTruncateRecoversFromIncompleteWrite(t *testing.T) {
 	setupIncompleteWrite(ctx, t, cs, ref, total)
 
 	writer, err := cs.Writer(ctx, ref, total, "")
-	require.NoError(t, err)
+	assert.NilError(t, err)
 
-	require.NoError(t, writer.Truncate(0))
+	assert.NilError(t, writer.Truncate(0))
 
 	_, err = writer.Write(content)
-	require.NoError(t, err)
+	assert.NilError(t, err)
 
 	dgst := digest.FromBytes(content)
 	err = writer.Commit(ctx, total, dgst)
-	require.NoError(t, err)
+	assert.NilError(t, err)
 }
 
 func setupIncompleteWrite(ctx context.Context, t *testing.T, cs content.Store, ref string, total int64) {
 	writer, err := cs.Writer(ctx, ref, total, "")
-	require.NoError(t, err)
+	assert.NilError(t, err)
 
 	_, err = writer.Write([]byte("bad data"))
-	require.NoError(t, err)
+	assert.NilError(t, err)
 
-	require.NoError(t, writer.Close())
+	assert.NilError(t, writer.Close())
 }

content/testsuite/testsuite.go

@@ -16,9 +16,9 @@ import (
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/testutil"
+	"github.com/gotestyourself/gotestyourself/assert"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/stretchr/testify/require"
 )
 
 // ContentSuite runs a test suite on the content store given a factory function.
@@ -188,7 +188,7 @@ func checkResumeWriter(ctx context.Context, t *testing.T, cs content.Store) {
 	}
 
 	checkStatus(t, w1, expected, dgstFirst, preStart, postStart, preUpdate, postUpdate)
-	require.NoError(t, w1.Close(), "close first writer")
+	assert.NilError(t, w1.Close(), "close first writer")
 
 	w2, err := cs.Writer(ctx, ref, 256, dgst)
 	if err != nil {
@@ -212,7 +212,7 @@ func checkResumeWriter(ctx context.Context, t *testing.T, cs content.Store) {
 	}
 	postCommit := time.Now()
 
-	require.NoError(t, w2.Close(), "close second writer")
+	assert.NilError(t, w2.Close(), "close second writer")
 	info := content.Info{
 		Digest: dgst,
 		Size:   256,