Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit f46d59e

Browse files
silvin-lubeckisilvin-lubecki
authored
Merge pull request #2456 from thaJeztah/19.03_backport_gotest_v3
[19.03 backport] bump gotest.tools v3.0.1 for compatibility with Go 1.14 Upstream-commit: 8986e312010f1ca18174b9a69d1577f5121fdc7d Component: cli
2 parents 256e26c + 1e9d825 commit f46d59e

261 files changed

Lines changed: 783 additions & 628 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.

‎components/cli/cli-plugins/manager/candidate_test.go‎

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

99
"github.com/spf13/cobra"
10-
"gotest.tools/assert"
11-
"gotest.tools/assert/cmp"
10+
"gotest.tools/v3/assert"
11+
"gotest.tools/v3/assert/cmp"
1212
)
1313

1414
type fakeCandidate struct {

‎components/cli/cli-plugins/manager/error_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/pkg/errors"
88
"gopkg.in/yaml.v2"
9-
"gotest.tools/assert"
9+
"gotest.tools/v3/assert"
1010
)
1111

1212
func TestPluginError(t *testing.T) {

‎components/cli/cli-plugins/manager/manager_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/docker/cli/cli/config"
88
"github.com/docker/cli/cli/config/configfile"
99
"github.com/docker/cli/internal/test"
10-
"gotest.tools/assert"
11-
"gotest.tools/fs"
10+
"gotest.tools/v3/assert"
11+
"gotest.tools/v3/fs"
1212
)
1313

1414
func TestListPluginCandidates(t *testing.T) {

‎components/cli/cli/cobra_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
pluginmanager "github.com/docker/cli/cli-plugins/manager"
77
"github.com/google/go-cmp/cmp/cmpopts"
88
"github.com/spf13/cobra"
9-
"gotest.tools/assert"
10-
is "gotest.tools/assert/cmp"
9+
"gotest.tools/v3/assert"
10+
is "gotest.tools/v3/assert/cmp"
1111
)
1212

1313
func TestVisitAll(t *testing.T) {

‎components/cli/cli/command/bundlefile/bundlefile_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 TestLoadFileV01Success(t *testing.T) {

‎components/cli/cli/command/checkpoint/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/docker/cli/internal/test"
99
"github.com/docker/docker/api/types"
1010
"github.com/pkg/errors"
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 TestCheckpointCreateErrors(t *testing.T) {

‎components/cli/cli/command/checkpoint/formatter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/docker/cli/cli/command/formatter"
88
"github.com/docker/docker/api/types"
9-
"gotest.tools/assert"
9+
"gotest.tools/v3/assert"
1010
)
1111

1212
func TestCheckpointContextFormatWrite(t *testing.T) {

‎components/cli/cli/command/checkpoint/list_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/docker/cli/internal/test"
88
"github.com/docker/docker/api/types"
99
"github.com/pkg/errors"
10-
"gotest.tools/assert"
11-
is "gotest.tools/assert/cmp"
12-
"gotest.tools/golden"
10+
"gotest.tools/v3/assert"
11+
is "gotest.tools/v3/assert/cmp"
12+
"gotest.tools/v3/golden"
1313
)
1414

1515
func TestCheckpointListErrors(t *testing.T) {

‎components/cli/cli/command/checkpoint/remove_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/docker/cli/internal/test"
88
"github.com/docker/docker/api/types"
99
"github.com/pkg/errors"
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 TestCheckpointRemoveErrors(t *testing.T) {

‎components/cli/cli/command/cli_options_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

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

1010
func contentTrustEnabled(t *testing.T) bool {

0 commit comments

Comments
 (0)