Migrate to gotestyourself/assert
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
@@ -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())
|
||||
}
|
||||
|
Reference in New Issue
Block a user