From e62b2d410cda6ac9166ac8d052fd3fb99a9460bf Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 23 Aug 2017 17:35:09 -0400 Subject: [PATCH] Move ErrorContains to an internal package. Signed-off-by: Daniel Nephin --- builder/dockerfile/dispatchers_test.go | 2 +- builder/dockerfile/internals_windows_test.go | 2 +- builder/remotecontext/remote_test.go | 2 +- client/swarm_get_unlock_key_test.go | 2 +- cmd/dockerd/daemon_test.go | 2 +- daemon/config/config_test.go | 2 +- daemon/delete_test.go | 2 +- distribution/pull_v2_test.go | 2 +- image/fs_test.go | 2 +- image/store_test.go | 2 +- integration/container/create_test.go | 2 +- {pkg => internal}/testutil/helpers.go | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename {pkg => internal}/testutil/helpers.go (100%) diff --git a/builder/dockerfile/dispatchers_test.go b/builder/dockerfile/dispatchers_test.go index b3672fce1b..fb1df83b83 100644 --- a/builder/dockerfile/dispatchers_test.go +++ b/builder/dockerfile/dispatchers_test.go @@ -14,8 +14,8 @@ import ( "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/builder" "github.com/docker/docker/builder/dockerfile/parser" + "github.com/docker/docker/internal/testutil" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/pkg/testutil" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/builder/dockerfile/internals_windows_test.go b/builder/dockerfile/internals_windows_test.go index 34a021ca63..ca6920c3de 100644 --- a/builder/dockerfile/internals_windows_test.go +++ b/builder/dockerfile/internals_windows_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/stretchr/testify/assert" ) diff --git a/builder/remotecontext/remote_test.go b/builder/remotecontext/remote_test.go index fae0a30240..c38433b340 100644 --- a/builder/remotecontext/remote_test.go +++ b/builder/remotecontext/remote_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/docker/docker/builder" + "github.com/docker/docker/internal/testutil" "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/client/swarm_get_unlock_key_test.go b/client/swarm_get_unlock_key_test.go index 8dd08d95f2..fbb290aae1 100644 --- a/client/swarm_get_unlock_key_test.go +++ b/client/swarm_get_unlock_key_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/cmd/dockerd/daemon_test.go b/cmd/dockerd/daemon_test.go index 3368ce3290..c559ee82a5 100644 --- a/cmd/dockerd/daemon_test.go +++ b/cmd/dockerd/daemon_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/docker/daemon/config" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/gotestyourself/gotestyourself/fs" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/daemon/config/config_test.go b/daemon/config/config_test.go index cc5f01063c..43246d99e0 100644 --- a/daemon/config/config_test.go +++ b/daemon/config/config_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/docker/docker/daemon/discovery" + "github.com/docker/docker/internal/testutil" "github.com/docker/docker/opts" - "github.com/docker/docker/pkg/testutil" "github.com/spf13/pflag" "github.com/stretchr/testify/assert" ) diff --git a/daemon/delete_test.go b/daemon/delete_test.go index f1a979003c..887fa53148 100644 --- a/daemon/delete_test.go +++ b/daemon/delete_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/container" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/stretchr/testify/require" ) diff --git a/distribution/pull_v2_test.go b/distribution/pull_v2_test.go index 698670f891..7355fb96e6 100644 --- a/distribution/pull_v2_test.go +++ b/distribution/pull_v2_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/reference" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/opencontainers/go-digest" ) diff --git a/image/fs_test.go b/image/fs_test.go index 5f2437cadd..5464ab5171 100644 --- a/image/fs_test.go +++ b/image/fs_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/image/store_test.go b/image/store_test.go index fc6d461d99..e6c1746eff 100644 --- a/image/store_test.go +++ b/image/store_test.go @@ -4,8 +4,8 @@ import ( "runtime" "testing" + "github.com/docker/docker/internal/testutil" "github.com/docker/docker/layer" - "github.com/docker/docker/pkg/testutil" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/integration/container/create_test.go b/integration/container/create_test.go index 4b83af41d4..6c8a084e5b 100644 --- a/integration/container/create_test.go +++ b/integration/container/create_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/docker/integration/util/request" - "github.com/docker/docker/pkg/testutil" + "github.com/docker/docker/internal/testutil" ) func TestCreateFailsWhenIdentifierDoesNotExist(t *testing.T) { diff --git a/pkg/testutil/helpers.go b/internal/testutil/helpers.go similarity index 100% rename from pkg/testutil/helpers.go rename to internal/testutil/helpers.go