Update tests to use gotest.tools angel

vdemeester · vdemeester · commit 832b05ae6763 · 2018-06-08T21:02:01.000+02:00
Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/cio/io_test.go b/cio/io_test.go
@@ -32,8 +32,8 @@ import (
 
 	"github.com/containerd/fifo"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func assertHasPrefix(t *testing.T, s, prefix string) {
diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestOpenFifos(t *testing.T) {
diff --git a/content/helpers_test.go b/content/helpers_test.go
@@ -25,9 +25,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"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 type copySource struct {
diff --git a/content/local/store_test.go b/content/local/store_test.go
@@ -37,9 +37,9 @@ import (
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/content/testsuite"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"gotest.tools/assert"
 )
 
 type memoryLabelStore struct {
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -31,10 +31,10 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 // ContentSuite runs a test suite on the content store given a factory function.
diff --git a/gc/scheduler/scheduler_test.go b/gc/scheduler/scheduler_test.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/gc"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestPauseThreshold(t *testing.T) {
diff --git a/images/oci/importer_test.go b/images/oci/importer_test.go
@@ -19,9 +19,9 @@ package oci
 import (
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"gotest.tools/assert"
 )
 
 func TestNormalizeImageRef(t *testing.T) {
diff --git a/log/context_test.go b/log/context_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestLoggerContext(t *testing.T) {
diff --git a/mount/lookup_test/lookup_linux_test.go b/mount/lookup_test/lookup_linux_test.go
@@ -36,7 +36,7 @@ import (
 
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func checkLookup(t *testing.T, fsType, mntPoint, dir string) {
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/mount"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 // Unmount unmounts a given mountPoint and sets t.Error if it fails
diff --git a/remotes/docker/scope_test.go b/remotes/docker/scope_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/reference"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestRepositoryScope(t *testing.T) {
diff --git a/services/server/server_test.go b/services/server/server_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNewErrorsWithSamePathForRootAndState(t *testing.T) {
diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go
@@ -27,9 +27,9 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 type testFunc func(context.Context, *testing.T, *MetaStore)
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -32,8 +32,8 @@ import (
 	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/continuity/fs/fstest"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 // SnapshotterSuite runs a test suite on the snapshotter given a factory function.
diff --git a/sys/oom_unix_test.go b/sys/oom_unix_test.go
@@ -29,8 +29,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ import (`
`32`	`32`
`33`	`33`	`"github.com/containerd/fifo"`
`34`	`34`	`"github.com/google/go-cmp/cmp/cmpopts"`
`35`		`- "github.com/gotestyourself/gotestyourself/assert"`
`36`		`- is "github.com/gotestyourself/gotestyourself/assert/cmp"`
	`35`	`+ "gotest.tools/assert"`
	`36`	`+ is "gotest.tools/assert/cmp"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`func assertHasPrefix(t *testing.T, s, prefix string) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"path/filepath"`
`24`	`24`	`"testing"`
`25`	`25`
`26`		`- "github.com/gotestyourself/gotestyourself/assert"`
	`26`	`+ "gotest.tools/assert"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func TestOpenFifos(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ package oci`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- "github.com/gotestyourself/gotestyourself/assert"`
`23`	`22`	`"github.com/opencontainers/go-digest"`
`24`	`23`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
	`24`	`+ "gotest.tools/assert"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestNormalizeImageRef(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"testing"`
`22`	`22`
`23`		`- "github.com/gotestyourself/gotestyourself/assert"`
	`23`	`+ "gotest.tools/assert"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func TestLoggerContext(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`
`37`	`37`	`"github.com/containerd/containerd/mount"`
`38`	`38`	`"github.com/containerd/containerd/pkg/testutil"`
`39`		`- "github.com/gotestyourself/gotestyourself/assert"`
	`39`	`+ "gotest.tools/assert"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`func checkLookup(t *testing.T, fsType, mntPoint, dir string) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"testing"`
`25`	`25`
`26`	`26`	`"github.com/containerd/containerd/mount"`
`27`		`- "github.com/gotestyourself/gotestyourself/assert"`
	`27`	`+ "gotest.tools/assert"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// Unmount unmounts a given mountPoint and sets t.Error if it fails`