toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump gotest.tools v3.0.1 for compatibility with Go 1.14

Browse Source 
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2020-02-22 18:12:14 +01:00
parent 740919cc7f
commit 2c0e93063b
248 changed files with 765 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/cli-plugins/config_test.go
View File

@ -5,8 +5,8 @@ import (
"testing"
"github.com/docker/cli/cli/config"
"gotest.tools/assert"
"gotest.tools/icmd"
"gotest.tools/v3/assert"
"gotest.tools/v3/icmd"
)
func TestConfig(t *testing.T) {

6
e2e/cli-plugins/dial_test.go
View File

@ -6,9 +6,9 @@ import (
"testing"
"github.com/docker/cli/cli-plugins/manager"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/icmd"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/icmd"
)
func TestCLIPluginDialStdio(t *testing.T) {

2
e2e/cli-plugins/flags_test.go
View File

@ -4,7 +4,7 @@ import (
"os"
"testing"
"gotest.tools/icmd"
"gotest.tools/v3/icmd"
)
// TestRunGoodArgument ensures correct behaviour when running a valid plugin with an `--argument`.

6
e2e/cli-plugins/help_test.go
View File

@ -6,9 +6,9 @@ import (
"strings"
"testing"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/icmd"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/icmd"
)
// TestGlobalHelp ensures correct behaviour when running `docker help`

8
e2e/cli-plugins/run_test.go
View File

@ -3,10 +3,10 @@ package cliplugins
import (
"testing"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
)
const shortHFlagDeprecated = "Flag shorthand -h has been deprecated, please use --help\n"

6
e2e/cli-plugins/util_test.go
View File

@ -7,9 +7,9 @@ import (
"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/configfile"
"gotest.tools/assert"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/v3/assert"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
)
func prepare(t *testing.T) (func(args ...string) icmd.Cmd, *configfile.ConfigFile, func()) {

2
e2e/container/attach_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"github.com/docker/cli/e2e/internal/fixtures"
"gotest.tools/icmd"
"gotest.tools/v3/icmd"
)
func TestAttachExitCode(t *testing.T) {

4
e2e/container/create_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
func TestCreateWithContentTrust(t *testing.T) {

4
e2e/container/kill_test.go
View File

@ -6,8 +6,8 @@ import (
"time"
"github.com/docker/cli/e2e/internal/fixtures"
"gotest.tools/icmd"
"gotest.tools/poll"
"gotest.tools/v3/icmd"
"gotest.tools/v3/poll"
)
func TestKillContainer(t *testing.T) {

6
e2e/container/proxy_signal_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/creack/pty"
"github.com/docker/cli/e2e/internal/fixtures"
"gotest.tools/assert"
"gotest.tools/icmd"
"gotest.tools/poll"
"gotest.tools/v3/assert"
"gotest.tools/v3/icmd"
"gotest.tools/v3/poll"
)
// TestSigProxyWithTTY tests that killing the docker CLI forwards the signal to

10
e2e/container/run_test.go
View File

@ -6,11 +6,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const registryPrefix = "registry:5000"

4
e2e/context/context_test.go
View File

@ -3,8 +3,8 @@ package context
import (
"testing"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
)
func TestContextList(t *testing.T) {

4
e2e/global/cli_test.go
View File

@ -4,8 +4,8 @@ import (
"testing"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
func TestTLSVerify(t *testing.T) {

10
e2e/image/build_test.go
View File

@ -10,11 +10,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"github.com/docker/cli/internal/test/output"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
func TestBuildFromContextDirectoryWithTag(t *testing.T) {

10
e2e/image/pull_test.go
View File

@ -5,11 +5,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const registryPrefix = "registry:5000"

10
e2e/image/push_test.go
View File

@ -10,11 +10,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"github.com/docker/cli/internal/test/output"
"gotest.tools/assert"
"gotest.tools/fs"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
"gotest.tools/v3/fs"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const (

4
e2e/internal/fixtures/fixtures.go
View File

@ -5,8 +5,8 @@ import (
"os"
"testing"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
)
const (

8
e2e/plugin/trust_test.go
View File

@ -12,10 +12,10 @@ import (
"github.com/docker/cli/internal/test/environment"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
"gotest.tools/assert"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const registryPrefix = "registry:5000"

8
e2e/stack/deploy_test.go
View File

@ -7,10 +7,10 @@ import (
"testing"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/assert"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
func TestDeployWithNamedResources(t *testing.T) {

4
e2e/stack/help_test.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"testing"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
)
func TestStackDeployHelp(t *testing.T) {

8
e2e/stack/remove_test.go
View File

@ -6,10 +6,10 @@ import (
"testing"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/golden"
"gotest.tools/icmd"
"gotest.tools/poll"
"gotest.tools/skip"
"gotest.tools/v3/golden"
"gotest.tools/v3/icmd"
"gotest.tools/v3/poll"
"gotest.tools/v3/skip"
)
var pollSettings = environment.DefaultPollSettings

2
e2e/system/inspect_test.go
View File

@ -3,7 +3,7 @@ package system
import (
"testing"
"gotest.tools/icmd"
"gotest.tools/v3/icmd"
)
// TestInspectInvalidReference migrated from moby/integration-cli

10
e2e/trust/revoke_test.go
View File

@ -6,11 +6,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const (

10
e2e/trust/sign_test.go
View File

@ -6,11 +6,11 @@ import (
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/fs"
"gotest.tools/icmd"
"gotest.tools/skip"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/fs"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
const (