vendor: gotest.tools v3.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

libnetwork/datastore/datastore_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/libnetwork/options"
 	_ "github.com/docker/libnetwork/testutils"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 var dummyKey = "dummy"

libnetwork/drivers/overlay/ovmanager/ovmanager_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/docker/libnetwork/netlabel"
 	_ "github.com/docker/libnetwork/testutils"
 	"github.com/docker/libnetwork/types"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func newDriver(t *testing.T) *driver {

libnetwork/drvregistry/drvregistry_test.go

@@ -11,8 +11,8 @@ import (
 	builtinIpam "github.com/docker/libnetwork/ipams/builtin"
 	nullIpam "github.com/docker/libnetwork/ipams/null"
 	remoteIpam "github.com/docker/libnetwork/ipams/remote"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 
 	// this takes care of the incontainer flag
 	_ "github.com/docker/libnetwork/testutils"

libnetwork/firewall_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/options"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 const (

libnetwork/ipam/allocator_test.go

@@ -19,8 +19,8 @@ import (
 	"github.com/docker/libnetwork/ipamapi"
 	_ "github.com/docker/libnetwork/testutils"
 	"github.com/docker/libnetwork/types"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 const (

libnetwork/ipam/parallel_test.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/docker/libnetwork/ipamapi"
 	"golang.org/x/sync/semaphore"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 const (

libnetwork/ipamutils/utils_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	_ "github.com/docker/libnetwork/testutils"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func initBroadPredefinedNetworks() []*net.IPNet {

libnetwork/networkdb/networkdb_test.go

@@ -15,9 +15,9 @@ import (
 	"github.com/docker/go-events"
 	"github.com/hashicorp/memberlist"
 	"github.com/sirupsen/logrus"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
-	"gotest.tools/poll"
+	"gotest.tools/v3/poll"
 
 	// this takes care of the incontainer flag
 	_ "github.com/docker/libnetwork/testutils"

libnetwork/osl/kernel/knobs_linux_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/sirupsen/logrus"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 
 	_ "github.com/docker/libnetwork/testutils"
 )

libnetwork/service_common_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/libnetwork/resolvconf"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestCleanupServiceDiscovery(t *testing.T) {

libnetwork/types/types_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	_ "github.com/docker/libnetwork/testutils"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
-	is "gotest.tools/assert/cmp"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestTransportPortConv(t *testing.T) {

libnetwork/vendor.conf

@@ -50,7 +50,7 @@ github.com/pkg/errors                               614d223910a179a466c1767a9854
 github.com/ishidawataru/sctp                        6e2cb1366111dcf547c13531e3a263a067715847
 go.opencensus.io                                    9c377598961b706d1542bd2d84d538b5094d596e # v0.22.0
 
-gotest.tools                                        1083505acf35a0bd8a696b26837e1fb3187a7a83 # v2.3.0
+gotest.tools/v3                                     bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 # v3.0.2
 github.com/google/go-cmp                            3af367b6b30c263d47e8895973edcca9a49cf029 # v0.2.0
 
 github.com/moby/ipvs                                4566ccea0e08d68e9614c3e7a64a23b850c4bb35 # v1.0.1

libnetwork/vendor/gotest.tools/go.mod

@@ -1,8 +0,0 @@
-module gotest.tools
-
-require (
-	github.com/google/go-cmp v0.2.0
-	github.com/pkg/errors v0.8.0
-	github.com/spf13/pflag v1.0.3
-	golang.org/x/tools v0.0.0-20180810170437-e96c4e24768d
-)

libnetwork/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

libnetwork/vendor/gotest.tools/v3/assert/assert.go

@@ -49,30 +49,31 @@ The example below shows assert used with some common types.
 
 Comparisons
 
-Package https://godoc.org/gotest.tools/assert/cmp provides
+Package http://gotest.tools/assert/cmp provides
 many common comparisons. Additional comparisons can be written to compare
 values in other ways. See the example Assert (CustomComparison).
 
 Automated migration from testify
 
-gty-migrate-from-testify is a binary which can update source code which uses
+gty-migrate-from-testify is a command which translates Go source code from
-testify assertions to use the assertions provided by this package.
+testify assertions to the assertions provided by this package.
 
-See http://bit.do/cmd-gty-migrate-from-testify.
+See http://gotest.tools/assert/cmd/gty-migrate-from-testify.
 
 
 */
-package assert // import "gotest.tools/assert"
+package assert // import "gotest.tools/v3/assert"
 
 import (
 	"fmt"
 	"go/ast"
 	"go/token"
+	"reflect"
 
 	gocmp "github.com/google/go-cmp/cmp"
-	"gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert/cmp"
-	"gotest.tools/internal/format"
+	"gotest.tools/v3/internal/format"
-	"gotest.tools/internal/source"
+	"gotest.tools/v3/internal/source"
 )
 
 // BoolOrComparison can be a bool, or cmp.Comparison. See Assert() for usage.
@@ -118,8 +119,8 @@ func assert(
 		return true
 
 	case error:
-		msg := "error is not nil: "
+		msg := failureMsgFromError(check)
-		t.Log(format.WithCustomMessage(failureMessage+msg+check.Error(), msgAndArgs...))
+		t.Log(format.WithCustomMessage(failureMessage+msg, msgAndArgs...))
 
 	case cmp.Comparison:
 		success = runComparison(t, argSelector, check, msgAndArgs...)
@@ -174,6 +175,15 @@ func logFailureFromBool(t TestingT, msgAndArgs ...interface{}) {
 	t.Log(format.WithCustomMessage(failureMessage+msg, msgAndArgs...))
 }
 
+func failureMsgFromError(err error) string {
+	// Handle errors with non-nil types
+	v := reflect.ValueOf(err)
+	if v.Kind() == reflect.Ptr && v.IsNil() {
+		return fmt.Sprintf("error is not nil: error has type %T", err)
+	}
+	return "error is not nil: " + err.Error()
+}
+
 func boolFailureMessage(expr ast.Expr) (string, error) {
 	if binaryExpr, ok := expr.(*ast.BinaryExpr); ok && binaryExpr.Op == token.NEQ {
 		x, err := source.FormatNode(binaryExpr.X)
@@ -202,17 +212,20 @@ func boolFailureMessage(expr ast.Expr) (string, error) {
 	return "expression is false: " + formatted, nil
 }
 
-// Assert performs a comparison. If the comparison fails the test is marked as
+// Assert performs a comparison. If the comparison fails, the test is marked as
 // failed, a failure message is logged, and execution is stopped immediately.
 //
-// The comparison argument may be one of three types: bool, cmp.Comparison or
+// The comparison argument may be one of three types:
-// error.
+//   bool
-// When called with a bool the failure message will contain the literal source
+// True is success. False is a failure.
-// code of the expression.
+// The failure message will contain the literal source code of the expression.
-// When called with a cmp.Comparison the comparison is responsible for producing
+//   cmp.Comparison
-// a helpful failure message.
+// Uses cmp.Result.Success() to check for success of failure.
-// When called with an error a nil value is considered success. A non-nil error
+// The comparison is responsible for producing a helpful failure message.
-// is a failure, and Error() is used as the failure message.
+// http://gotest.tools/assert/cmp provides many common comparisons.
+//   error
+// A nil value is considered success.
+// A non-nil error is a failure, err.Error() is used as the failure message.
 func Assert(t TestingT, comparison BoolOrComparison, msgAndArgs ...interface{}) {
 	if ht, ok := t.(helperT); ok {
 		ht.Helper()
@@ -260,10 +273,10 @@ func Equal(t TestingT, x, y interface{}, msgAndArgs ...interface{}) {
 	assert(t, t.FailNow, argsAfterT, cmp.Equal(x, y), msgAndArgs...)
 }
 
-// DeepEqual uses google/go-cmp (http://bit.do/go-cmp) to assert two values are
+// DeepEqual uses google/go-cmp (https://godoc.org/github.com/google/go-cmp/cmp)
-// equal and fails the test if they are not equal.
+// to assert two values are equal and fails the test if they are not equal.
 //
-// Package https://godoc.org/gotest.tools/assert/opt provides some additional
+// Package http://gotest.tools/assert/opt provides some additional
 // commonly used Options.
 //
 // This is equivalent to Assert(t, cmp.DeepEqual(x, y)).
@@ -295,14 +308,19 @@ func ErrorContains(t TestingT, err error, substring string, msgAndArgs ...interf
 }
 
 // ErrorType fails the test if err is nil, or err is not the expected type.
+// Equivalent to Assert(t, cmp.ErrorType(err, expected)).
 //
 // Expected can be one of:
-// a func(error) bool which returns true if the error is the expected type,
+//   func(error) bool
-// an instance of (or a pointer to) a struct of the expected type,
+// Function should return true if the error is the expected type.
-// a pointer to an interface the error is expected to implement,
+//   type struct{}, type &struct{}
-// a reflect.Type of the expected struct or interface.
+// A struct or a pointer to a struct.
-//
+// Fails if the error is not of the same type as expected.
-// Equivalent to Assert(t, cmp.ErrorType(err, expected)).
+//   type &interface{}
+// A pointer to an interface type.
+// Fails if err does not implement the interface.
+//   reflect.Type
+// Fails if err does not implement the reflect.Type
 func ErrorType(t TestingT, err error, expected interface{}, msgAndArgs ...interface{}) {
 	if ht, ok := t.(helperT); ok {
 		ht.Helper()

libnetwork/vendor/gotest.tools/v3/assert/cmp/compare.go

@@ -1,5 +1,5 @@
 /*Package cmp provides Comparisons for Assert and Check*/
-package cmp // import "gotest.tools/assert/cmp"
+package cmp // import "gotest.tools/v3/assert/cmp"
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
-	"gotest.tools/internal/format"
+	"gotest.tools/v3/internal/format"
 )
 
 // Comparison is a function which compares values and returns ResultSuccess if
@@ -16,11 +16,12 @@ import (
 // Result will contain a message about why it failed.
 type Comparison func() Result
 
-// DeepEqual compares two values using google/go-cmp (http://bit.do/go-cmp)
+// DeepEqual compares two values using google/go-cmp
+// (https://godoc.org/github.com/google/go-cmp/cmp)
 // and succeeds if the values are equal.
 //
 // The comparison can be customized using comparison Options.
-// Package https://godoc.org/gotest.tools/assert/opt provides some additional
+// Package http://gotest.tools/assert/opt provides some additional
 // commonly used Options.
 func DeepEqual(x, y interface{}, opts ...cmp.Option) Comparison {
 	return func() (result Result) {
@@ -103,10 +104,10 @@ func Equal(x, y interface{}) Comparison {
 			return multiLineDiffResult(diff)
 		}
 		return ResultFailureTemplate(`
-			{{- .Data.x}} (
+			{{- printf "%v" .Data.x}} (
 				{{- with callArg 0 }}{{ formatNode . }} {{end -}}
 				{{- printf "%T" .Data.x -}}
-			) != {{ .Data.y}} (
+			) != {{ printf "%v" .Data.y}} (
 				{{- with callArg 1 }}{{ formatNode . }} {{end -}}
 				{{- printf "%T" .Data.y -}}
 			)`,
@@ -241,10 +242,12 @@ func ErrorContains(err error, substring string) Comparison {
 	}
 }
 
-func formatErrorMessage(err error) string {
+type causer interface {
-	if _, ok := err.(interface {
 	Cause() error
-	}); ok {
+}
+
+func formatErrorMessage(err error) string {
+	if _, ok := err.(causer); ok {
 		return fmt.Sprintf("%q\n%+v", err, err)
 	}
 	// This error was not wrapped with github.com/pkg/errors
@@ -283,10 +286,16 @@ func isNil(obj interface{}, msgFunc func(reflect.Value) string) Comparison {
 // ErrorType succeeds if err is not nil and is of the expected type.
 //
 // Expected can be one of:
-// a func(error) bool which returns true if the error is the expected type,
+//   func(error) bool
-// an instance of (or a pointer to) a struct of the expected type,
+// Function should return true if the error is the expected type.
-// a pointer to an interface the error is expected to implement,
+//   type struct{}, type &struct{}
-// a reflect.Type of the expected struct or interface.
+// A struct or a pointer to a struct.
+// Fails if the error is not of the same type as expected.
+//   type &interface{}
+// A pointer to an interface type.
+// Fails if err does not implement the interface.
+//   reflect.Type
+// Fails if err does not implement the reflect.Type
 func ErrorType(err error, expected interface{}) Comparison {
 	return func() Result {
 		switch expectedType := expected.(type) {

libnetwork/vendor/gotest.tools/v3/assert/cmp/result.go

@@ -6,7 +6,7 @@ import (
 	"go/ast"
 	"text/template"
 
-	"gotest.tools/internal/source"
+	"gotest.tools/v3/internal/source"
 )
 
 // A Result of a Comparison.

libnetwork/vendor/gotest.tools/v3/assert/result.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"go/ast"
 
-	"gotest.tools/assert/cmp"
+	"gotest.tools/v3/assert/cmp"
-	"gotest.tools/internal/format"
+	"gotest.tools/v3/internal/format"
-	"gotest.tools/internal/source"
+	"gotest.tools/v3/internal/source"
 )
 
 func runComparison(

libnetwork/vendor/gotest.tools/v3/go.mod

@@ -0,0 +1,10 @@
+module gotest.tools/v3
+
+require (
+	github.com/google/go-cmp v0.3.0
+	github.com/pkg/errors v0.8.1
+	github.com/spf13/pflag v1.0.3
+	golang.org/x/tools v0.0.0-20190624222133-a101b041ded4
+)
+
+go 1.11

libnetwork/vendor/gotest.tools/v3/internal/difflib/difflib.go

@@ -4,7 +4,7 @@ Original source: https://github.com/pmezard/go-difflib
 
 This file is trimmed to only the parts used by this repository.
 */
-package difflib // import "gotest.tools/internal/difflib"
+package difflib // import "gotest.tools/v3/internal/difflib"
 
 func min(a, b int) int {
 	if a < b {

libnetwork/vendor/gotest.tools/v3/internal/format/diff.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"unicode"
 
-	"gotest.tools/internal/difflib"
+	"gotest.tools/v3/internal/difflib"
 )
 
 const (

libnetwork/vendor/gotest.tools/v3/internal/format/format.go

@@ -1,4 +1,4 @@
-package format // import "gotest.tools/internal/format"
+package format // import "gotest.tools/v3/internal/format"
 
 import "fmt"
 

libnetwork/vendor/gotest.tools/v3/internal/source/source.go

@@ -1,4 +1,4 @@
-package source // import "gotest.tools/internal/source"
+package source // import "gotest.tools/v3/internal/source"
 
 import (
 	"bytes"
@@ -92,7 +92,9 @@ func nodePosition(fileset *token.FileSet, node ast.Node) token.Position {
 	return fileset.Position(node.Pos())
 }
 
-var goVersionBefore19 = func() bool {
+// GoVersionLessThan returns true if runtime.Version() is semantically less than
+// version 1.minor.
+func GoVersionLessThan(minor int64) bool {
 	version := runtime.Version()
 	// not a release version
 	if !strings.HasPrefix(version, "go") {
@@ -103,9 +105,11 @@ var goVersionBefore19 = func() bool {
 	if len(parts) < 2 {
 		return false
 	}
-	minor, err := strconv.ParseInt(parts[1], 10, 32)
+	actual, err := strconv.ParseInt(parts[1], 10, 32)
-	return err == nil && parts[0] == "1" && minor < 9
+	return err == nil && parts[0] == "1" && actual < minor
-}()
+}
+
+var goVersionBefore19 = GoVersionLessThan(9)
 
 func getCallExprArgs(node ast.Node) ([]ast.Expr, error) {
 	visitor := &callExprVisitor{}

libnetwork/vendor/gotest.tools/v3/poll/poll.go

@@ -1,6 +1,6 @@
 /*Package poll provides tools for testing asynchronous code.
  */
-package poll // import "gotest.tools/poll"
+package poll // import "gotest.tools/v3/poll"
 
 import (
 	"fmt"