Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2358 from thaJeztah/gotest_v3 

bump gotest.tools v3.0.1 for compatibility with Go 1.14
This commit is contained in:
Silvin Lubecki 2020-02-26 15:19:54 +01:00 committed by GitHub
parent e67b4b4be2 2c0e93063b
commit 00264b952c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
248 changed files with 765 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli-plugins/manager/candidate_test.go
View File

@ -7,8 +7,8 @@ import (
"testing" "testing"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/assert/cmp" "gotest.tools/v3/assert/cmp"
) )
type fakeCandidate struct { type fakeCandidate struct {

2
cli-plugins/manager/error_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestPluginError(t *testing.T) { func TestPluginError(t *testing.T) {

4
cli-plugins/manager/manager_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/fs" "gotest.tools/v3/fs"
) )
func TestListPluginCandidates(t *testing.T) { func TestListPluginCandidates(t *testing.T) {

4
cli/cobra_test.go
View File

@ -6,8 +6,8 @@ import (
pluginmanager "github.com/docker/cli/cli-plugins/manager" pluginmanager "github.com/docker/cli/cli-plugins/manager"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestVisitAll(t *testing.T) { func TestVisitAll(t *testing.T) {

4
cli/command/checkpoint/create_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestCheckpointCreateErrors(t *testing.T) { func TestCheckpointCreateErrors(t *testing.T) {

2
cli/command/checkpoint/formatter_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestCheckpointContextFormatWrite(t *testing.T) { func TestCheckpointContextFormatWrite(t *testing.T) {

6
cli/command/checkpoint/list_test.go
View File

@ -7,9 +7,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestCheckpointListErrors(t *testing.T) { func TestCheckpointListErrors(t *testing.T) {

4
cli/command/checkpoint/remove_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestCheckpointRemoveErrors(t *testing.T) { func TestCheckpointRemoveErrors(t *testing.T) {

2
cli/command/cli_options_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func contentTrustEnabled(t *testing.T) bool { func contentTrustEnabled(t *testing.T) bool {

8
cli/command/cli_test.go
View File

@ -18,10 +18,10 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/env" "gotest.tools/v3/env"
"gotest.tools/fs" "gotest.tools/v3/fs"
) )
func TestNewAPIClientFromFlags(t *testing.T) { func TestNewAPIClientFromFlags(t *testing.T) {

6
cli/command/config/create_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
const configDataFile = "config-create-with-name.golden" const configDataFile = "config-create-with-name.golden"

4
cli/command/config/formatter_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestConfigContextFormatWrite(t *testing.T) { func TestConfigContextFormatWrite(t *testing.T) {

4
cli/command/config/inspect_test.go
View File

@ -10,8 +10,8 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestConfigInspectErrors(t *testing.T) { func TestConfigInspectErrors(t *testing.T) {

6
cli/command/config/ls_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestConfigListErrors(t *testing.T) { func TestConfigListErrors(t *testing.T) {

4
cli/command/config/remove_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestConfigRemoveErrors(t *testing.T) { func TestConfigRemoveErrors(t *testing.T) {

2
cli/command/container/attach_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNewAttachCommandErrors(t *testing.T) { func TestNewAttachCommandErrors(t *testing.T) {

8
cli/command/container/cp_test.go
View File

@ -11,10 +11,10 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/fs" "gotest.tools/v3/fs"
"gotest.tools/skip" "gotest.tools/v3/skip"
) )
func TestRunCopyWithInvalidArguments(t *testing.T) { func TestRunCopyWithInvalidArguments(t *testing.T) {

8
cli/command/container/create_test.go
View File

@ -18,10 +18,10 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/fs" "gotest.tools/v3/fs"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestCIDFileNoOPWithNoFilename(t *testing.T) { func TestCIDFileNoOPWithNoFilename(t *testing.T) {

4
cli/command/container/exec_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/cli/opts" "github.com/docker/cli/opts"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func withDefaultOpts(options execOptions) execOptions { func withDefaultOpts(options execOptions) execOptions {

4
cli/command/container/export_test.go
View File

@ -7,8 +7,8 @@ import (
"testing" "testing"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/fs" "gotest.tools/v3/fs"
) )
func TestContainerExportOutputToFile(t *testing.T) { func TestContainerExportOutputToFile(t *testing.T) {

4
cli/command/container/formatter_diff_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestDiffContextFormatWrite(t *testing.T) { func TestDiffContextFormatWrite(t *testing.T) {

4
cli/command/container/formatter_stats_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestContainerStatsContext(t *testing.T) { func TestContainerStatsContext(t *testing.T) {

6
cli/command/container/list_test.go
View File

@ -10,9 +10,9 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/cli/opts" "github.com/docker/cli/opts"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestContainerListBuildContainerListOptions(t *testing.T) { func TestContainerListBuildContainerListOptions(t *testing.T) {

4
cli/command/container/logs_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
var logFn = func(expectedOut string) func(string, types.ContainerLogsOptions) (io.ReadCloser, error) { var logFn = func(expectedOut string) func(string, types.ContainerLogsOptions) (io.ReadCloser, error) {

6
cli/command/container/opts_test.go
View File

@ -14,9 +14,9 @@ import (
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/skip" "gotest.tools/v3/skip"
) )
func TestValidateAttach(t *testing.T) { func TestValidateAttach(t *testing.T) {

4
cli/command/container/run_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/cli/internal/test/notary" "github.com/docker/cli/internal/test/notary"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestRunLabel(t *testing.T) { func TestRunLabel(t *testing.T) {

2
cli/command/container/stats_helpers_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestCalculateMemUsageUnixNoCache(t *testing.T) { func TestCalculateMemUsageUnixNoCache(t *testing.T) {

4
cli/command/container/tty_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestInitTtySizeErrors(t *testing.T) { func TestInitTtySizeErrors(t *testing.T) {

4
cli/command/container/utils_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func waitFn(cid string) (<-chan container.ContainerWaitOKBody, <-chan error) { func waitFn(cid string) (<-chan container.ContainerWaitOKBody, <-chan error) {

4
cli/command/context/create_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/docker/cli/cli/context/kubernetes" "github.com/docker/cli/cli/context/kubernetes"
"github.com/docker/cli/cli/context/store" "github.com/docker/cli/cli/context/store"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/env" "gotest.tools/v3/env"
) )
func makeFakeCli(t *testing.T, opts ...func(*test.FakeCli)) (*test.FakeCli, func()) { func makeFakeCli(t *testing.T, opts ...func(*test.FakeCli)) (*test.FakeCli, func()) {

2
cli/command/context/export-import_test.go
View File

@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/docker/cli/cli/streams" "github.com/docker/cli/cli/streams"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestExportImportWithFile(t *testing.T) { func TestExportImportWithFile(t *testing.T) {

4
cli/command/context/inspect_test.go
View File

@ -4,8 +4,8 @@ import (
"strings" "strings"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestInspect(t *testing.T) { func TestInspect(t *testing.T) {

6
cli/command/context/list_test.go
View File

@ -4,9 +4,9 @@ import (
"testing" "testing"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/env" "gotest.tools/v3/env"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func createTestContextWithKubeAndSwarm(t *testing.T, cli command.Cli, name string, orchestrator string) { func createTestContextWithKubeAndSwarm(t *testing.T, cli command.Cli, name string, orchestrator string) {

2
cli/command/context/remove_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/cli/context/store" "github.com/docker/cli/cli/context/store"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestRemove(t *testing.T) { func TestRemove(t *testing.T) {

4
cli/command/context/update_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/context/docker" "github.com/docker/cli/cli/context/docker"
"github.com/docker/cli/cli/context/kubernetes" "github.com/docker/cli/cli/context/kubernetes"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/assert/cmp" "gotest.tools/v3/assert/cmp"
) )
func TestUpdateDescriptionOnly(t *testing.T) { func TestUpdateDescriptionOnly(t *testing.T) {

2
cli/command/context/use_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/cli/context/store" "github.com/docker/cli/cli/context/store"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestUse(t *testing.T) { func TestUse(t *testing.T) {

6
cli/command/defaultcontextstore_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/cli/cli/context/store" "github.com/docker/cli/cli/context/store"
cliflags "github.com/docker/cli/cli/flags" cliflags "github.com/docker/cli/cli/flags"
"github.com/docker/go-connections/tlsconfig" "github.com/docker/go-connections/tlsconfig"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/env" "gotest.tools/v3/env"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
type endpoint struct { type endpoint struct {

6
cli/command/formatter/container_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestContainerPsContext(t *testing.T) { func TestContainerPsContext(t *testing.T) {

6
cli/command/formatter/disk_usage_test.go
View File

@ -4,9 +4,9 @@ import (
"bytes" "bytes"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestDiskUsageContextFormatWrite(t *testing.T) { func TestDiskUsageContextFormatWrite(t *testing.T) {

4
cli/command/formatter/displayutils_test.go
View File

@ -3,8 +3,8 @@ package formatter
import ( import (
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestEllipsis(t *testing.T) { func TestEllipsis(t *testing.T) {

4
cli/command/formatter/image_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestImageContext(t *testing.T) { func TestImageContext(t *testing.T) {

4
cli/command/formatter/volume_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestVolumeContext(t *testing.T) { func TestVolumeContext(t *testing.T) {

4
cli/command/idresolver/idresolver_test.go
View File

@ -7,8 +7,8 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestResolveError(t *testing.T) { func TestResolveError(t *testing.T) {

4
cli/command/image/build/context_test.go
View File

@ -13,8 +13,8 @@ import (
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/fileutils"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
const dockerfileContents = "FROM busybox" const dockerfileContents = "FROM busybox"

6
cli/command/image/build_test.go
View File

@ -19,9 +19,9 @@ import (
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/moby/buildkit/session/secrets/secretsprovider" "github.com/moby/buildkit/session/secrets/secretsprovider"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/fs" "gotest.tools/v3/fs"
"gotest.tools/skip" "gotest.tools/v3/skip"
) )
func TestRunBuildDockerfileFromStdinWithCompress(t *testing.T) { func TestRunBuildDockerfileFromStdinWithCompress(t *testing.T) {

4
cli/command/image/formatter_history_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/image"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
type historyCase struct { type historyCase struct {

6
cli/command/image/history_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/image"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
"gotest.tools/skip" "gotest.tools/v3/skip"
) )
func TestNewHistoryCommandErrors(t *testing.T) { func TestNewHistoryCommandErrors(t *testing.T) {

4
cli/command/image/import_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNewImportCommandErrors(t *testing.T) { func TestNewImportCommandErrors(t *testing.T) {

6
cli/command/image/inspect_test.go
View File

@ -7,9 +7,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNewInspectCommandErrors(t *testing.T) { func TestNewInspectCommandErrors(t *testing.T) {

6
cli/command/image/list_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNewImagesCommandErrors(t *testing.T) { func TestNewImagesCommandErrors(t *testing.T) {

4
cli/command/image/load_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNewLoadCommandErrors(t *testing.T) { func TestNewLoadCommandErrors(t *testing.T) {

6
cli/command/image/prune_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNewPruneCommandErrors(t *testing.T) { func TestNewPruneCommandErrors(t *testing.T) {

6
cli/command/image/pull_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/cli/internal/test/notary" "github.com/docker/cli/internal/test/notary"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNewPullCommandErrors(t *testing.T) { func TestNewPullCommandErrors(t *testing.T) {

2
cli/command/image/push_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNewPushCommandErrors(t *testing.T) { func TestNewPushCommandErrors(t *testing.T) {

6
cli/command/image/remove_test.go
View File

@ -8,9 +8,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
type notFound struct { type notFound struct {

4
cli/command/image/save_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNewSaveCommandErrors(t *testing.T) { func TestNewSaveCommandErrors(t *testing.T) {

4
cli/command/image/tag_test.go
View File

@ -5,8 +5,8 @@ import (
"testing" "testing"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestCliNewTagCommandErrors(t *testing.T) { func TestCliNewTagCommandErrors(t *testing.T) {

2
cli/command/image/trust_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/passphrase"
"github.com/theupdateframework/notary/trustpinning" "github.com/theupdateframework/notary/trustpinning"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func unsetENV() { func unsetENV() {

4
cli/command/inspect/inspector_test.go
View File

@ -6,8 +6,8 @@ import (
"testing" "testing"
"github.com/docker/cli/templates" "github.com/docker/cli/templates"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
type testElement struct { type testElement struct {

6
cli/command/manifest/annotate_test.go
View File

@ -5,9 +5,9 @@ import (
"testing" "testing"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestManifestAnnotateError(t *testing.T) { func TestManifestAnnotateError(t *testing.T) {

6
cli/command/manifest/create_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestManifestCreateErrors(t *testing.T) { func TestManifestCreateErrors(t *testing.T) {

6
cli/command/manifest/inspect_test.go
View File

@ -16,9 +16,9 @@ import (
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func newTempManifestStore(t *testing.T) (store.Store, func()) { func newTempManifestStore(t *testing.T) (store.Store, func()) {

2
cli/command/manifest/push_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func newFakeRegistryClient() *fakeRegistryClient { func newFakeRegistryClient() *fakeRegistryClient {

4
cli/command/network/connect_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNetworkConnectErrors(t *testing.T) { func TestNetworkConnectErrors(t *testing.T) {

4
cli/command/network/create_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNetworkCreateErrors(t *testing.T) { func TestNetworkCreateErrors(t *testing.T) {

2
cli/command/network/disconnect_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNetworkDisconnectErrors(t *testing.T) { func TestNetworkDisconnectErrors(t *testing.T) {

4
cli/command/network/formatter_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNetworkContext(t *testing.T) { func TestNetworkContext(t *testing.T) {

6
cli/command/network/list_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNetworkListErrors(t *testing.T) { func TestNetworkListErrors(t *testing.T) {

2
cli/command/node/demote_test.go
View File

@ -8,7 +8,7 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNodeDemoteErrors(t *testing.T) { func TestNodeDemoteErrors(t *testing.T) {

4
cli/command/node/formatter_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestNodeContext(t *testing.T) { func TestNodeContext(t *testing.T) {

4
cli/command/node/inspect_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNodeInspectErrors(t *testing.T) { func TestNodeInspectErrors(t *testing.T) {

6
cli/command/node/list_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNodeListErrorOnAPIFailure(t *testing.T) { func TestNodeListErrorOnAPIFailure(t *testing.T) {

2
cli/command/node/promote_test.go
View File

@ -8,7 +8,7 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNodePromoteErrors(t *testing.T) { func TestNodePromoteErrors(t *testing.T) {

4
cli/command/node/ps_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestNodePsErrors(t *testing.T) { func TestNodePsErrors(t *testing.T) {

2
cli/command/node/remove_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNodeRemoveErrors(t *testing.T) { func TestNodeRemoveErrors(t *testing.T) {

2
cli/command/node/update_test.go
View File

@ -8,7 +8,7 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestNodeUpdateErrors(t *testing.T) { func TestNodeUpdateErrors(t *testing.T) {

6
cli/command/orchestrator_test.go
View File

@ -4,9 +4,9 @@ import (
"io/ioutil" "io/ioutil"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/env" "gotest.tools/v3/env"
) )
func TestOrchestratorSwitch(t *testing.T) { func TestOrchestratorSwitch(t *testing.T) {

6
cli/command/plugin/create_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/fs" "gotest.tools/v3/fs"
) )
func TestCreateErrors(t *testing.T) { func TestCreateErrors(t *testing.T) {

4
cli/command/plugin/disable_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestPluginDisableErrors(t *testing.T) { func TestPluginDisableErrors(t *testing.T) {

4
cli/command/plugin/enable_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestPluginEnableErrors(t *testing.T) { func TestPluginEnableErrors(t *testing.T) {

4
cli/command/plugin/formatter_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestPluginContext(t *testing.T) { func TestPluginContext(t *testing.T) {

4
cli/command/plugin/inspect_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
var pluginFoo = &types.Plugin{ var pluginFoo = &types.Plugin{

2
cli/command/plugin/install_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/docker/cli/internal/test/notary" "github.com/docker/cli/internal/test/notary"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
) )
func TestInstallErrors(t *testing.T) { func TestInstallErrors(t *testing.T) {

6
cli/command/plugin/list_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestListErrors(t *testing.T) { func TestListErrors(t *testing.T) {

4
cli/command/plugin/remove_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestRemoveErrors(t *testing.T) { func TestRemoveErrors(t *testing.T) {

6
cli/command/registry/formatter_search_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestSearchContext(t *testing.T) { func TestSearchContext(t *testing.T) {

6
cli/command/registry/login_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/fs" "gotest.tools/v3/fs"
) )
const userErr = "userunknownError" const userErr = "userunknownError"

4
cli/command/registry_test.go
View File

@ -7,8 +7,8 @@ import (
"testing" "testing"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
// Prevents a circular import with "github.com/docker/cli/internal/test" // Prevents a circular import with "github.com/docker/cli/internal/test"

4
cli/command/secret/create_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
const secretDataFile = "secret-create-with-name.golden" const secretDataFile = "secret-create-with-name.golden"

4
cli/command/secret/formatter_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestSecretContextFormatWrite(t *testing.T) { func TestSecretContextFormatWrite(t *testing.T) {

4
cli/command/secret/inspect_test.go
View File

@ -10,8 +10,8 @@ import (
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function . "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestSecretInspectErrors(t *testing.T) { func TestSecretInspectErrors(t *testing.T) {

6
cli/command/secret/ls_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestSecretListErrors(t *testing.T) { func TestSecretListErrors(t *testing.T) {

4
cli/command/secret/remove_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test"
"github.com/pkg/errors" "github.com/pkg/errors"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestSecretRemoveErrors(t *testing.T) { func TestSecretRemoveErrors(t *testing.T) {

4
cli/command/service/create_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
cliopts "github.com/docker/cli/opts" cliopts "github.com/docker/cli/opts"
) )

6
cli/command/service/formatter_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestServiceContextWrite(t *testing.T) { func TestServiceContextWrite(t *testing.T) {

4
cli/command/service/generic_resource_opts_test.go
View File

@ -3,8 +3,8 @@ package service
import ( import (
"testing" "testing"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestValidateSingleGenericResource(t *testing.T) { func TestValidateSingleGenericResource(t *testing.T) {

4
cli/command/service/inspect_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string { func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string {

6
cli/command/service/list_test.go
View File

@ -13,9 +13,9 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/api/types/versions" "github.com/docker/docker/api/types/versions"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/golden" "gotest.tools/v3/golden"
) )
func TestServiceListOrder(t *testing.T) { func TestServiceListOrder(t *testing.T) {

4
cli/command/service/opts_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
func TestCredentialSpecOpt(t *testing.T) { func TestCredentialSpecOpt(t *testing.T) {

4
cli/command/service/progress/progress_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"gotest.tools/assert" "gotest.tools/v3/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )
type mockProgress struct { type mockProgress struct {

Some files were not shown because too many files have changed in this diff Show More