vendor: update gotest.tools v3.0.2

thaJeztah · thaJeztah · commit f2edc6f164f9 · 2020-02-28T17:47:20.000+01:00
full diff: gotestyourself/gotest.tools@v2.3.0...v3.0.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/cio/io_test.go b/cio/io_test.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/containerd/fifo"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/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"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestOpenFifos(t *testing.T) {
diff --git a/cio/io_windows_test.go b/cio/io_windows_test.go
@@ -21,7 +21,7 @@ package cio
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestNewFifoSetInDir_NoTerminal(t *testing.T) {
diff --git a/client_ttrpc_test.go b/client_ttrpc_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/containerd/containerd/pkg/ttrpcutil"
 	"github.com/containerd/ttrpc"
 	"github.com/gogo/protobuf/types"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestClientTTRPC_New(t *testing.T) {
diff --git a/content/helpers_test.go b/content/helpers_test.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/containerd/containerd/errdefs"
 	"github.com/opencontainers/go-digest"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 type copySource struct {
diff --git a/content/local/store_test.go b/content/local/store_test.go
@@ -40,7 +40,7 @@ import (
 
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 type memoryLabelStore struct {
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -36,7 +36,7 @@ import (
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 const (
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"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestPauseThreshold(t *testing.T) {
diff --git a/log/context_test.go b/log/context_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestLoggerContext(t *testing.T) {
diff --git a/mount/lookup_linux_test.go b/mount/lookup_linux_test.go
@@ -31,7 +31,7 @@ import (
 	// so we use continuity/testutil instead.
 	"github.com/containerd/continuity/testutil"
 	"github.com/containerd/continuity/testutil/loopback"
-	"gotest.tools/assert"
+	"gotest.tools/v3/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"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 // Unmount unmounts a given mountPoint and sets t.Error if it fails
diff --git a/remotes/docker/fetcher_test.go b/remotes/docker/fetcher_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestFetcherOpen(t *testing.T) {
diff --git a/remotes/docker/scope_test.go b/remotes/docker/scope_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/reference"
-	"gotest.tools/assert"
-	"gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	"gotest.tools/v3/assert/cmp"
 )
 
 func TestRepositoryScope(t *testing.T) {
diff --git a/services/server/config/config_test.go b/services/server/config/config_test.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 
 	"github.com/containerd/containerd/plugin"
 )
diff --git a/services/server/server_test.go b/services/server/server_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	srvconfig "github.com/containerd/containerd/services/server/config"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestCreateTopLevelDirectoriesErrorsWithSamePathForRootAndState(t *testing.T) {
diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/snapshots"
diff --git a/snapshots/devmapper/config_test.go b/snapshots/devmapper/config_test.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/hashicorp/go-multierror"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestLoadConfig(t *testing.T) {
diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/snapshots/devmapper/dmsetup/dmsetup_test.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/docker/go-units"
 	"golang.org/x/sys/unix"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 
 	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots/devmapper/losetup"
diff --git a/snapshots/devmapper/losetup/losetup_test.go b/snapshots/devmapper/losetup/losetup_test.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/docker/go-units"
 	"golang.org/x/sys/unix"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 
 	"github.com/containerd/containerd/pkg/testutil"
 )
diff --git a/snapshots/devmapper/metadata_test.go b/snapshots/devmapper/metadata_test.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/pkg/errors"
 	"go.etcd.io/bbolt"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 var (
diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/containerd/snapshots/devmapper/losetup"
 	"github.com/docker/go-units"
 	"github.com/sirupsen/logrus"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 const (
diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go
@@ -28,8 +28,8 @@ import (
 	"github.com/containerd/containerd/snapshots"
 	"github.com/google/go-cmp/cmp"
 	"github.com/pkg/errors"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 type testFunc func(context.Context, *testing.T, *MetaStore)
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -34,8 +34,8 @@ import (
 	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/continuity/fs/fstest"
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 // SnapshotterFunc is used in SnapshotterSuite
diff --git a/sys/oom_unix_test.go b/sys/oom_unix_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	"gotest.tools/assert"
-	is "gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {
diff --git a/vendor.conf b/vendor.conf
@@ -50,7 +50,7 @@ golang.org/x/sys                                    c990c680b611ac1aeb7d8f2af94a
 golang.org/x/text                                   19e51611da83d6be54ddafce4a4af510cb3e9ea4
 google.golang.org/genproto                          e50cd9704f63023d62cd06a1994b98227fc4d21a
 google.golang.org/grpc                              f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc # v1.27.1
-gotest.tools                                        1083505acf35a0bd8a696b26837e1fb3187a7a83 # v2.3.0
+gotest.tools/v3                                     bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 # v3.0.2
 
 # cri dependencies
 github.com/containerd/cri                           c0294ebfe0b4342db85c0faf7727ceb8d8c3afce # master
diff --git a/vendor/gotest.tools/go.mod b/vendor/gotest.tools/go.mod
diff --git a/vendor/gotest.tools/v3/LICENSE b/vendor/gotest.tools/v3/LICENSE
diff --git a/vendor/gotest.tools/v3/README.md b/vendor/gotest.tools/v3/README.md
@@ -2,26 +2,41 @@
 
 A collection of packages to augment `testing` and support common patterns.
 
-[![GoDoc](https://godoc.org/gotest.tools?status.svg)](https://godoc.org/gotest.tools)
+[![GoDoc](https://godoc.org/gotest.tools?status.svg)](http://gotest.tools)
 [![CircleCI](https://circleci.com/gh/gotestyourself/gotest.tools/tree/master.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotest.tools/tree/master)
 [![Go Reportcard](https://goreportcard.com/badge/gotest.tools)](https://goreportcard.com/report/gotest.tools)
 
+## Usage
+
+With Go modules enabled (go1.11+)
+
+```
+$ go get gotest.tools/v3
+```
+
+```
+import "gotest.tools/v3/assert"
+```
+
+To use `gotest.tools` with an older version of Go that does not understand Go
+module paths pin to version `v2.3.0`.
+
 
 ## Packages
 
-* [assert](http://godoc.org/gotest.tools/assert) -
+* [assert](http://gotest.tools/assert) -
   compare values and fail the test when a comparison fails
-* [env](http://godoc.org/gotest.tools/env) -
+* [env](http://gotest.tools/env) -
   test code which uses environment variables
-* [fs](http://godoc.org/gotest.tools/fs) -
+* [fs](http://gotest.tools/fs) -
   create temporary files and compare a filesystem tree to an expected value
-* [golden](http://godoc.org/gotest.tools/golden) -
+* [golden](http://gotest.tools/golden) -
   compare large multi-line strings against values frozen in golden files
-* [icmd](http://godoc.org/gotest.tools/icmd) -
+* [icmd](http://gotest.tools/icmd) -
   execute binaries and test the output
-* [poll](http://godoc.org/gotest.tools/poll) -
+* [poll](http://gotest.tools/poll) -
   test asynchronous code by polling until a desired state is reached
-* [skip](http://godoc.org/gotest.tools/skip) -
+* [skip](http://gotest.tools/skip) -
   skip a test and print the source code of the condition used to skip the test
 
 ## Related
diff --git a/vendor/gotest.tools/v3/assert/assert.go b/vendor/gotest.tools/v3/assert/assert.go
diff --git a/vendor/gotest.tools/v3/assert/cmp/compare.go b/vendor/gotest.tools/v3/assert/cmp/compare.go
diff --git a/vendor/gotest.tools/v3/assert/cmp/result.go b/vendor/gotest.tools/v3/assert/cmp/result.go
diff --git a/vendor/gotest.tools/v3/assert/result.go b/vendor/gotest.tools/v3/assert/result.go
diff --git a/vendor/gotest.tools/v3/go.mod b/vendor/gotest.tools/v3/go.mod
diff --git a/vendor/gotest.tools/v3/internal/difflib/LICENSE b/vendor/gotest.tools/v3/internal/difflib/LICENSE
diff --git a/vendor/gotest.tools/v3/internal/difflib/difflib.go b/vendor/gotest.tools/v3/internal/difflib/difflib.go
diff --git a/vendor/gotest.tools/v3/internal/format/diff.go b/vendor/gotest.tools/v3/internal/format/diff.go
diff --git a/vendor/gotest.tools/v3/internal/format/format.go b/vendor/gotest.tools/v3/internal/format/format.go
diff --git a/vendor/gotest.tools/v3/internal/source/defers.go b/vendor/gotest.tools/v3/internal/source/defers.go
diff --git a/vendor/gotest.tools/v3/internal/source/source.go b/vendor/gotest.tools/v3/internal/source/source.go

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ import (`
`33`	`33`
`34`	`34`	`"github.com/containerd/fifo"`
`35`	`35`	`"github.com/google/go-cmp/cmp/cmpopts"`
`36`		`- "gotest.tools/assert"`
`37`		`- is "gotest.tools/assert/cmp"`
	`36`	`+ "gotest.tools/v3/assert"`
	`37`	`+ is "gotest.tools/v3/assert/cmp"`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`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`		`- "gotest.tools/assert"`
	`26`	`+ "gotest.tools/v3/assert"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func TestOpenFifos(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ package cio`
`21`	`21`	`import (`
`22`	`22`	`"testing"`
`23`	`23`
`24`		`- "gotest.tools/assert"`
	`24`	`+ "gotest.tools/v3/assert"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestNewFifoSetInDir_NoTerminal(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/containerd/containerd/pkg/ttrpcutil"`
`27`	`27`	`"github.com/containerd/ttrpc"`
`28`	`28`	`"github.com/gogo/protobuf/types"`
`29`		`- "gotest.tools/assert"`
	`29`	`+ "gotest.tools/v3/assert"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func TestClientTTRPC_New(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ import (`
`26`	`26`
`27`	`27`	`"github.com/containerd/containerd/errdefs"`
`28`	`28`	`"github.com/opencontainers/go-digest"`
`29`		`- "gotest.tools/assert"`
`30`		`- is "gotest.tools/assert/cmp"`
	`29`	`+ "gotest.tools/v3/assert"`
	`30`	`+ is "gotest.tools/v3/assert/cmp"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`type copySource struct {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ import (`
`40`	`40`
`41`	`41`	`"github.com/opencontainers/go-digest"`
`42`	`42`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`43`		`- "gotest.tools/assert"`
	`43`	`+ "gotest.tools/v3/assert"`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`type memoryLabelStore struct {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`digest "github.com/opencontainers/go-digest"`
`37`	`37`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`38`	`38`	`"github.com/pkg/errors"`
`39`		`- "gotest.tools/assert"`
	`39`	`+ "gotest.tools/v3/assert"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"testing"`
`22`	`22`
`23`		`- "gotest.tools/assert"`
	`23`	`+ "gotest.tools/v3/assert"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func TestLoggerContext(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`// so we use continuity/testutil instead.`
`32`	`32`	`"github.com/containerd/continuity/testutil"`
`33`	`33`	`"github.com/containerd/continuity/testutil/loopback"`
`34`		`- "gotest.tools/assert"`
	`34`	`+ "gotest.tools/v3/assert"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`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`		`- "gotest.tools/assert"`
	`27`	`+ "gotest.tools/v3/assert"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// Unmount unmounts a given mountPoint and sets t.Error if it fails`