summaryrefslogtreecommitdiff
path: root/integration/internal
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2020-02-07 14:39:24 +0100
committerSebastiaan van Stijn <github@gone.nl>2020-02-11 00:06:42 +0100
commit9f0b3f5609faf69537cdf1882c251deec6e9eb26 (patch)
tree3c1fb5a8190e27d6c0a6c4041c8ed24228f995d5 /integration/internal
parentc6400be46865296db2891d6cf1324982700537e0 (diff)
downloaddocker-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/internal')
-rw-r--r--integration/internal/container/container.go2
-rw-r--r--integration/internal/container/states.go2
-rw-r--r--integration/internal/network/network.go2
-rw-r--r--integration/internal/network/states.go2
-rw-r--r--integration/internal/requirement/requirement_linux.go2
-rw-r--r--integration/internal/swarm/service.go6
-rw-r--r--integration/internal/swarm/states.go2
7 files changed, 9 insertions, 9 deletions
diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go
index e8b87ec068..46a2c51daa 100644
--- a/integration/internal/container/container.go
+++ b/integration/internal/container/container.go
@@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
- "gotest.tools/assert"
+ "gotest.tools/v3/assert"
)
// TestContainerConfig holds container configuration struct that
diff --git a/integration/internal/container/states.go b/integration/internal/container/states.go
index 2397159188..fea8e3f598 100644
--- a/integration/internal/container/states.go
+++ b/integration/internal/container/states.go
@@ -6,7 +6,7 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"
- "gotest.tools/poll"
+ "gotest.tools/v3/poll"
)
// IsStopped verifies the container is in stopped state.
diff --git a/integration/internal/network/network.go b/integration/internal/network/network.go
index c8194d7898..4f1f176993 100644
--- a/integration/internal/network/network.go
+++ b/integration/internal/network/network.go
@@ -6,7 +6,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
- "gotest.tools/assert"
+ "gotest.tools/v3/assert"
)
func createNetwork(ctx context.Context, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) (string, error) {
diff --git a/integration/internal/network/states.go b/integration/internal/network/states.go
index 1f00e0b80c..31bf6ac7fe 100644
--- a/integration/internal/network/states.go
+++ b/integration/internal/network/states.go
@@ -5,7 +5,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
- "gotest.tools/poll"
+ "gotest.tools/v3/poll"
)
// IsRemoved verifies the network is removed.
diff --git a/integration/internal/requirement/requirement_linux.go b/integration/internal/requirement/requirement_linux.go
index 1197e407ed..0718646f9c 100644
--- a/integration/internal/requirement/requirement_linux.go
+++ b/integration/internal/requirement/requirement_linux.go
@@ -5,7 +5,7 @@ import (
"strings"
"github.com/docker/docker/pkg/parsers/kernel"
- "gotest.tools/icmd"
+ "gotest.tools/v3/icmd"
)
// CgroupNamespacesEnabled checks if cgroup namespaces are enabled on this host
diff --git a/integration/internal/swarm/service.go b/integration/internal/swarm/service.go
index ccf945b6fa..ed30045c2d 100644
--- a/integration/internal/swarm/service.go
+++ b/integration/internal/swarm/service.go
@@ -12,9 +12,9 @@ import (
"github.com/docker/docker/client"
"github.com/docker/docker/testutil/daemon"
"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"
)
// ServicePoll tweaks the pollSettings for `service`
diff --git a/integration/internal/swarm/states.go b/integration/internal/swarm/states.go
index 77b3f30209..3f69feeef3 100644
--- a/integration/internal/swarm/states.go
+++ b/integration/internal/swarm/states.go
@@ -8,7 +8,7 @@ import (
"github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
- "gotest.tools/poll"
+ "gotest.tools/v3/poll"
)
// NoTasksForService verifies that there are no more tasks for the given service