Skip to content

Commit 9f0b3f5

Browse files
thaJeztahthaJeztah
committed
bump gotest.tools v3.0.1 for compatibility with Go 1.14
full diff: gotestyourself/gotest.tools@v2.3.0...v3.0.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent c6400be commit 9f0b3f5

385 files changed

Lines changed: 1054 additions & 868 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/server/middleware/debug_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package middleware // import "github.com/docker/docker/api/server/middleware"
33
import (
44
"testing"
55

6-
"gotest.tools/assert"
7-
is "gotest.tools/assert/cmp"
6+
"gotest.tools/v3/assert"
7+
is "gotest.tools/v3/assert/cmp"
88
)
99

1010
func TestMaskSecretKeys(t *testing.T) {

‎api/server/middleware/version_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99

1010
"github.com/docker/docker/api/server/httputils"
11-
"gotest.tools/assert"
12-
is "gotest.tools/assert/cmp"
11+
"gotest.tools/v3/assert"
12+
is "gotest.tools/v3/assert/cmp"
1313
)
1414

1515
func TestVersionMiddlewareVersion(t *testing.T) {

‎api/types/filters/parse_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"errors"
55
"testing"
66

7-
"gotest.tools/assert"
8-
is "gotest.tools/assert/cmp"
7+
"gotest.tools/v3/assert"
8+
is "gotest.tools/v3/assert/cmp"
99
)
1010

1111
func TestToJSON(t *testing.T) {

‎builder/dockerfile/buildargs_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strings"
66
"testing"
77

8-
"gotest.tools/assert"
9-
is "gotest.tools/assert/cmp"
8+
"gotest.tools/v3/assert"
9+
is "gotest.tools/v3/assert/cmp"
1010
)
1111

1212
func strPtr(source string) *string {

‎builder/dockerfile/copy_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66

77
"github.com/docker/docker/pkg/containerfs"
8-
"gotest.tools/assert"
9-
is "gotest.tools/assert/cmp"
10-
"gotest.tools/fs"
8+
"gotest.tools/v3/assert"
9+
is "gotest.tools/v3/assert/cmp"
10+
"gotest.tools/v3/fs"
1111
)
1212

1313
func TestIsExistingDirectory(t *testing.T) {

‎builder/dockerfile/dispatchers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/moby/buildkit/frontend/dockerfile/instructions"
1919
"github.com/moby/buildkit/frontend/dockerfile/parser"
2020
"github.com/moby/buildkit/frontend/dockerfile/shell"
21-
"gotest.tools/assert"
22-
is "gotest.tools/assert/cmp"
21+
"gotest.tools/v3/assert"
22+
is "gotest.tools/v3/assert/cmp"
2323
)
2424

2525
func newBuilderWithMockBackend() *Builder {

‎builder/dockerfile/evaluator_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/docker/docker/pkg/archive"
1010
"github.com/docker/docker/pkg/reexec"
1111
"github.com/moby/buildkit/frontend/dockerfile/instructions"
12-
"gotest.tools/assert"
13-
is "gotest.tools/assert/cmp"
14-
"gotest.tools/skip"
12+
"gotest.tools/v3/assert"
13+
is "gotest.tools/v3/assert/cmp"
14+
"gotest.tools/v3/skip"
1515
)
1616

1717
type dispatchTestCase struct {

‎builder/dockerfile/imagecontext_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/docker/docker/builder"
1010
"github.com/docker/docker/image"
1111
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
12-
"gotest.tools/assert"
12+
"gotest.tools/v3/assert"
1313
)
1414

1515
func getMockImageSource(getImageImage builder.Image, getImageLayer builder.ROLayer, getImageError error) *imageSources {

‎builder/dockerfile/internals_linux_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/docker/docker/api/types"
99
"github.com/docker/docker/pkg/idtools"
10-
"gotest.tools/assert"
11-
is "gotest.tools/assert/cmp"
10+
"gotest.tools/v3/assert"
11+
is "gotest.tools/v3/assert/cmp"
1212
)
1313

1414
func TestChownFlagParsing(t *testing.T) {

‎builder/dockerfile/internals_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/docker/docker/pkg/containerfs"
1818
"github.com/docker/go-connections/nat"
1919
"github.com/opencontainers/go-digest"
20-
"gotest.tools/assert"
21-
is "gotest.tools/assert/cmp"
22-
"gotest.tools/skip"
20+
"gotest.tools/v3/assert"
21+
is "gotest.tools/v3/assert/cmp"
22+
"gotest.tools/v3/skip"
2323
)
2424

2525
func TestEmptyDockerfile(t *testing.T) {

0 commit comments

Comments
 (0)