diff options
author | Sebastiaan van Stijn <github@gone.nl> | 2020-02-07 14:39:24 +0100 |
---|---|---|
committer | Sebastiaan van Stijn <github@gone.nl> | 2020-02-11 00:06:42 +0100 |
commit | 9f0b3f5609faf69537cdf1882c251deec6e9eb26 (patch) | |
tree | 3c1fb5a8190e27d6c0a6c4041c8ed24228f995d5 /integration/plugin | |
parent | c6400be46865296db2891d6cf1324982700537e0 (diff) | |
download | docker-9f0b3f5609faf69537cdf1882c251deec6e9eb26.tar.gz |
bump gotest.tools v3.0.1 for compatibility with Go 1.14
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'integration/plugin')
-rw-r--r-- | integration/plugin/authz/authz_plugin_test.go | 6 | ||||
-rw-r--r-- | integration/plugin/authz/authz_plugin_v2_test.go | 4 | ||||
-rw-r--r-- | integration/plugin/authz/main_test.go | 2 | ||||
-rw-r--r-- | integration/plugin/common/plugin_test.go | 4 | ||||
-rw-r--r-- | integration/plugin/graphdriver/external_test.go | 6 | ||||
-rw-r--r-- | integration/plugin/logging/logging_linux_test.go | 4 | ||||
-rw-r--r-- | integration/plugin/logging/validation_test.go | 4 | ||||
-rw-r--r-- | integration/plugin/volumes/helpers_test.go | 2 | ||||
-rw-r--r-- | integration/plugin/volumes/mounts_test.go | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go index af8acaa428..2ae52f3965 100644 --- a/integration/plugin/authz/authz_plugin_test.go +++ b/integration/plugin/authz/authz_plugin_test.go @@ -25,9 +25,9 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/testutil/environment" - "gotest.tools/assert" - "gotest.tools/poll" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/poll" + "gotest.tools/v3/skip" ) const ( diff --git a/integration/plugin/authz/authz_plugin_v2_test.go b/integration/plugin/authz/authz_plugin_v2_test.go index 937bcd3ef6..b72552ac4f 100644 --- a/integration/plugin/authz/authz_plugin_v2_test.go +++ b/integration/plugin/authz/authz_plugin_v2_test.go @@ -16,8 +16,8 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/integration/internal/container" "github.com/docker/docker/integration/internal/requirement" - "gotest.tools/assert" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/skip" ) var ( diff --git a/integration/plugin/authz/main_test.go b/integration/plugin/authz/main_test.go index 07dbefa33c..7c1bf56c57 100644 --- a/integration/plugin/authz/main_test.go +++ b/integration/plugin/authz/main_test.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/testutil/daemon" "github.com/docker/docker/testutil/environment" - "gotest.tools/skip" + "gotest.tools/v3/skip" ) var ( diff --git a/integration/plugin/common/plugin_test.go b/integration/plugin/common/plugin_test.go index 6e2a5e9e90..35dc7fb980 100644 --- a/integration/plugin/common/plugin_test.go +++ b/integration/plugin/common/plugin_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/docker/testutil/request" - "gotest.tools/assert" - is "gotest.tools/assert/cmp" + "gotest.tools/v3/assert" + is "gotest.tools/v3/assert/cmp" ) func TestPluginInvalidJSON(t *testing.T) { diff --git a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go index 0013ec7bc7..c9c99ff070 100644 --- a/integration/plugin/graphdriver/external_test.go +++ b/integration/plugin/graphdriver/external_test.go @@ -22,9 +22,9 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/testutil/daemon" - "gotest.tools/assert" - is "gotest.tools/assert/cmp" - "gotest.tools/skip" + "gotest.tools/v3/assert" + is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/skip" ) type graphEventsCounter struct { diff --git a/integration/plugin/logging/logging_linux_test.go b/integration/plugin/logging/logging_linux_test.go index 3ee66fdc77..a959e86bcc 100644 --- a/integration/plugin/logging/logging_linux_test.go +++ b/integration/plugin/logging/logging_linux_test.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/integration/internal/container" "github.com/docker/docker/testutil/daemon" - "gotest.tools/assert" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/skip" ) func TestContinueAfterPluginCrash(t *testing.T) { diff --git a/integration/plugin/logging/validation_test.go b/integration/plugin/logging/validation_test.go index 07f8c21ce8..8a59b65474 100644 --- a/integration/plugin/logging/validation_test.go +++ b/integration/plugin/logging/validation_test.go @@ -8,8 +8,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/testutil/daemon" - "gotest.tools/assert" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/skip" ) // Regression test for #35553 diff --git a/integration/plugin/volumes/helpers_test.go b/integration/plugin/volumes/helpers_test.go index 1238ae62d5..223ea9144a 100644 --- a/integration/plugin/volumes/helpers_test.go +++ b/integration/plugin/volumes/helpers_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/pkg/locker" "github.com/docker/docker/testutil/fixtures/plugin" "github.com/pkg/errors" - "gotest.tools/assert" + "gotest.tools/v3/assert" ) var pluginBuildLock = locker.New() diff --git a/integration/plugin/volumes/mounts_test.go b/integration/plugin/volumes/mounts_test.go index e3165c22f2..87ec9caeca 100644 --- a/integration/plugin/volumes/mounts_test.go +++ b/integration/plugin/volumes/mounts_test.go @@ -9,8 +9,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/testutil/daemon" "github.com/docker/docker/testutil/fixtures/plugin" - "gotest.tools/assert" - "gotest.tools/skip" + "gotest.tools/v3/assert" + "gotest.tools/v3/skip" ) // TestPluginWithDevMounts tests very specific regression caused by mounts ordering |