github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Migrate to gotestyourself/assert

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin
2018-01-23 12:06:06 -05:00
parent 1719a6e17a
commit ef48a0268e
13 changed files with 113 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/testsuite/testsuite.go
View File

@@ -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,