diff options
Diffstat (limited to 'integration')
31 files changed, 31 insertions, 31 deletions
diff --git a/integration/build/build_test.go b/integration/build/build_test.go index 6b936ba774..2a87204113 100644 --- a/integration/build/build_test.go +++ b/integration/build/build_test.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/integration-cli/cli/build/fakecontext" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/pkg/jsonmessage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/container/create_test.go b/integration/container/create_test.go index ace90700e1..5bacd01e45 100644 --- a/integration/container/create_test.go +++ b/integration/container/create_test.go @@ -7,7 +7,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/integration/internal/request" "github.com/docker/docker/internal/testutil" "github.com/gotestyourself/gotestyourself/skip" ) diff --git a/integration/container/exec_test.go b/integration/container/exec_test.go index 589f0aba86..a14284806d 100644 --- a/integration/container/exec_test.go +++ b/integration/container/exec_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/strslice" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/require" ) diff --git a/integration/container/health_test.go b/integration/container/health_test.go index 6185174e5d..a5c62edb57 100644 --- a/integration/container/health_test.go +++ b/integration/container/health_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/gotestyourself/gotestyourself/poll" "github.com/stretchr/testify/require" ) diff --git a/integration/container/inspect_test.go b/integration/container/inspect_test.go index 43df2a21df..1123684126 100644 --- a/integration/container/inspect_test.go +++ b/integration/container/inspect_test.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" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/assert" diff --git a/integration/container/kill_test.go b/integration/container/kill_test.go index 2bef7e4e96..caf2a55ab3 100644 --- a/integration/container/kill_test.go +++ b/integration/container/kill_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/require" diff --git a/integration/container/links_linux_test.go b/integration/container/links_linux_test.go index 4959689ce5..b1dc654c20 100644 --- a/integration/container/links_linux_test.go +++ b/integration/container/links_linux_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/pkg/stdcopy" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index 5ac838a2bd..0732e2d852 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/api/types" "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/integration/internal/request" "github.com/docker/go-connections/nat" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" diff --git a/integration/container/ps_test.go b/integration/container/ps_test.go index 24113e5001..dfcb0e2efe 100644 --- a/integration/container/ps_test.go +++ b/integration/container/ps_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/integration/container/rename_test.go b/integration/container/rename_test.go index 965bfe17e3..e6af2ac9e9 100644 --- a/integration/container/rename_test.go +++ b/integration/container/rename_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types" "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/integration/internal/request" "github.com/docker/docker/internal/testutil" "github.com/docker/docker/pkg/stringid" "github.com/gotestyourself/gotestyourself/poll" diff --git a/integration/container/resize_test.go b/integration/container/resize_test.go index b1422f88f7..887f1f6292 100644 --- a/integration/container/resize_test.go +++ b/integration/container/resize_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" req "github.com/docker/docker/integration-cli/request" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/internal/testutil" "github.com/gotestyourself/gotestyourself/poll" "github.com/stretchr/testify/assert" diff --git a/integration/container/stats_test.go b/integration/container/stats_test.go index f06407ec2d..577d446d15 100644 --- a/integration/container/stats_test.go +++ b/integration/container/stats_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "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/integration/internal/request" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/assert" diff --git a/integration/container/stop_test.go b/integration/container/stop_test.go index a66e70f071..0a9daff2bd 100644 --- a/integration/container/stop_test.go +++ b/integration/container/stop_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/gotestyourself/gotestyourself/icmd" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" diff --git a/integration/container/update_linux_test.go b/integration/container/update_linux_test.go index d1238e724d..f8138624b9 100644 --- a/integration/container/update_linux_test.go +++ b/integration/container/update_linux_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/pkg/stdcopy" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go index b5dd38a7e1..a515b706af 100644 --- a/integration/image/commit_test.go +++ b/integration/image/commit_test.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/integration/image/import_test.go b/integration/image/import_test.go index 4521a8a14e..b3a0c7c76c 100644 --- a/integration/image/import_test.go +++ b/integration/image/import_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/internal/testutil" ) diff --git a/integration/util/request/client.go b/integration/internal/request/client.go index 5c1ec08607..ca2486af4c 100644 --- a/integration/util/request/client.go +++ b/integration/internal/request/client.go @@ -1,4 +1,4 @@ -package request // import "github.com/docker/docker/integration/util/request" +package request // import "github.com/docker/docker/integration/internal/request" import ( "net" diff --git a/integration/util/requirement/requirement.go b/integration/internal/requirement/requirement.go index 07035dec87..f89eb03786 100644 --- a/integration/util/requirement/requirement.go +++ b/integration/internal/requirement/requirement.go @@ -1,4 +1,4 @@ -package requirement // import "github.com/docker/docker/integration/util/requirement" +package requirement // import "github.com/docker/docker/integration/internal/requirement" import ( "net/http" diff --git a/integration/util/swarm/service.go b/integration/internal/swarm/service.go index bd001ba0b4..bd001ba0b4 100644 --- a/integration/util/swarm/service.go +++ b/integration/internal/swarm/service.go diff --git a/integration/network/delete_test.go b/integration/network/delete_test.go index 25a42c9bd9..0877d8bc8c 100644 --- a/integration/network/delete_test.go +++ b/integration/network/delete_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go index 0d78d4c982..befebe4080 100644 --- a/integration/plugin/authz/authz_plugin_test.go +++ b/integration/plugin/authz/authz_plugin_test.go @@ -23,7 +23,7 @@ import ( eventtypes "github.com/docker/docker/api/types/events" networktypes "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/docker/docker/internal/test/environment" "github.com/docker/docker/pkg/authorization" "github.com/gotestyourself/gotestyourself/skip" diff --git a/integration/plugin/authz/authz_plugin_v2_test.go b/integration/plugin/authz/authz_plugin_v2_test.go index 6b7a9df2ce..3f07f48f01 100644 --- a/integration/plugin/authz/authz_plugin_v2_test.go +++ b/integration/plugin/authz/authz_plugin_v2_test.go @@ -16,7 +16,7 @@ import ( networktypes "github.com/docker/docker/api/types/network" volumetypes "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/requirement" + "github.com/docker/docker/integration/internal/requirement" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/require" ) diff --git a/integration/secret/secret_test.go b/integration/secret/secret_test.go index 566598db97..3915bf5e82 100644 --- a/integration/secret/secret_test.go +++ b/integration/secret/secret_test.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" - "github.com/docker/docker/integration/util/swarm" + "github.com/docker/docker/integration/internal/swarm" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/service/create_test.go b/integration/service/create_test.go index c74c8fb52e..eb66cfc2f1 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/filters" swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/swarm" + "github.com/docker/docker/integration/internal/swarm" "github.com/gotestyourself/gotestyourself/poll" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/service/inspect_test.go b/integration/service/inspect_test.go index 8fe97d98ad..fdb22cf2f7 100644 --- a/integration/service/inspect_test.go +++ b/integration/service/inspect_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types/filters" swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" - "github.com/docker/docker/integration/util/swarm" + "github.com/docker/docker/integration/internal/swarm" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/assert" diff --git a/integration/service/network_test.go b/integration/service/network_test.go index 1a9297c6b3..22b271c8c2 100644 --- a/integration/service/network_test.go +++ b/integration/service/network_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/client" - "github.com/docker/docker/integration/util/swarm" + "github.com/docker/docker/integration/internal/swarm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/integration/system/event_test.go b/integration/system/event_test.go index f9364cd232..5094e188ff 100644 --- a/integration/system/event_test.go +++ b/integration/system/event_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/strslice" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/require" ) diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go index 513cef8676..8f0271e7a6 100644 --- a/integration/system/info_linux_test.go +++ b/integration/system/info_linux_test.go @@ -7,7 +7,7 @@ import ( "testing" req "github.com/docker/docker/integration-cli/request" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/integration/system/info_test.go b/integration/system/info_test.go index 4b90b5c61c..47c46cb871 100644 --- a/integration/system/info_test.go +++ b/integration/system/info_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/integration/system/login_test.go b/integration/system/login_test.go index 295f37cee1..c075109d2b 100644 --- a/integration/system/login_test.go +++ b/integration/system/login_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/docker/docker/integration/util/request" - "github.com/docker/docker/integration/util/requirement" + "github.com/docker/docker/integration/internal/request" + "github.com/docker/docker/integration/internal/requirement" "github.com/gotestyourself/gotestyourself/skip" "github.com/stretchr/testify/assert" "golang.org/x/net/context" diff --git a/integration/system/version_test.go b/integration/system/version_test.go index 605ab503da..04888a604a 100644 --- a/integration/system/version_test.go +++ b/integration/system/version_test.go @@ -3,7 +3,7 @@ package system // import "github.com/docker/docker/integration/system" import ( "testing" - "github.com/docker/docker/integration/util/request" + "github.com/docker/docker/integration/internal/request" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" |