From d3e45f8743116182927dafaf6df318ecaf1c4876 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 6 Sep 2025 21:12:32 +0200 Subject: [PATCH] testutil: move back to internal This package was originally internal, but was moved out when BuildKit used it for its integration tests. That's no longer the case, so we can make it internal again. Signed-off-by: Sebastiaan van Stijn --- integration-cli/check_test.go | 12 ++++++------ integration-cli/cli/build/build.go | 2 +- integration-cli/daemon/daemon.go | 2 +- integration-cli/docker_api_attach_test.go | 4 ++-- integration-cli/docker_api_build_test.go | 10 +++++----- integration-cli/docker_api_build_windows_test.go | 6 +++--- integration-cli/docker_api_containers_test.go | 4 ++-- .../docker_api_containers_windows_test.go | 2 +- integration-cli/docker_api_exec_resize_test.go | 4 ++-- integration-cli/docker_api_exec_test.go | 4 ++-- integration-cli/docker_api_images_test.go | 4 ++-- integration-cli/docker_api_inspect_test.go | 2 +- integration-cli/docker_api_logs_test.go | 4 ++-- integration-cli/docker_api_network_test.go | 4 ++-- integration-cli/docker_api_stats_test.go | 4 ++-- integration-cli/docker_api_swarm_node_test.go | 2 +- integration-cli/docker_api_swarm_service_test.go | 4 ++-- integration-cli/docker_api_swarm_test.go | 6 +++--- integration-cli/docker_api_test.go | 4 ++-- integration-cli/docker_cli_build_test.go | 8 ++++---- integration-cli/docker_cli_build_unix_test.go | 2 +- integration-cli/docker_cli_create_test.go | 2 +- integration-cli/docker_cli_daemon_test.go | 4 ++-- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_exec_test.go | 2 +- .../docker_cli_external_volume_driver_test.go | 4 ++-- integration-cli/docker_cli_info_unix_test.go | 2 +- integration-cli/docker_cli_logout_test.go | 2 +- integration-cli/docker_cli_logs_test.go | 4 ++-- integration-cli/docker_cli_network_unix_test.go | 4 ++-- integration-cli/docker_cli_plugins_logdriver_test.go | 2 +- integration-cli/docker_cli_plugins_test.go | 4 ++-- integration-cli/docker_cli_port_test.go | 2 +- integration-cli/docker_cli_prune_unix_test.go | 2 +- .../docker_cli_registry_user_agent_test.go | 4 ++-- integration-cli/docker_cli_run_test.go | 6 +++--- integration-cli/docker_cli_run_unix_test.go | 2 +- integration-cli/docker_cli_save_load_unix_test.go | 2 +- integration-cli/docker_cli_service_create_test.go | 2 +- integration-cli/docker_cli_service_health_test.go | 2 +- integration-cli/docker_cli_service_logs_test.go | 2 +- integration-cli/docker_cli_service_scale_test.go | 2 +- integration-cli/docker_cli_swarm_test.go | 4 ++-- integration-cli/docker_cli_swarm_unix_test.go | 2 +- integration-cli/docker_cli_update_unix_test.go | 4 ++-- integration-cli/docker_cli_userns_test.go | 2 +- integration-cli/docker_cli_v2_only_test.go | 2 +- integration-cli/docker_cli_volume_test.go | 2 +- integration-cli/docker_hub_pull_suite_test.go | 2 +- integration-cli/docker_utils_test.go | 2 +- integration-cli/environment/environment.go | 2 +- integration-cli/fixtures_linux_daemon_test.go | 2 +- integration-cli/requirements_test.go | 2 +- integration-cli/utils_test.go | 2 +- integration/build/build_cgroupns_linux_test.go | 6 +++--- integration/build/build_squash_test.go | 6 +++--- integration/build/build_test.go | 4 ++-- integration/build/build_traces_test.go | 2 +- integration/build/build_userns_linux_test.go | 8 ++++---- integration/build/main_test.go | 4 ++-- integration/capabilities/capabilities_linux_test.go | 4 ++-- integration/capabilities/main_linux_test.go | 4 ++-- integration/config/config_test.go | 2 +- integration/config/main_test.go | 4 ++-- integration/container/attach_test.go | 4 ++-- integration/container/cdi_test.go | 4 ++-- integration/container/checkpoint_test.go | 2 +- integration/container/container_test.go | 4 ++-- integration/container/copy_test.go | 2 +- integration/container/create_test.go | 2 +- integration/container/daemon_linux_test.go | 4 ++-- integration/container/daemon_test.go | 4 ++-- integration/container/devices_windows_test.go | 2 +- integration/container/exec_test.go | 4 ++-- integration/container/export_test.go | 4 ++-- integration/container/inspect_test.go | 2 +- integration/container/ipcmode_linux_test.go | 6 +++--- integration/container/kill_test.go | 4 ++-- integration/container/list_test.go | 4 ++-- integration/container/main_test.go | 4 ++-- integration/container/mounts_linux_test.go | 2 +- integration/container/pause_test.go | 2 +- integration/container/resize_test.go | 2 +- integration/container/restart_test.go | 4 ++-- integration/container/run_cgroupns_linux_test.go | 4 ++-- integration/container/run_linux_test.go | 4 ++-- integration/container/update_linux_test.go | 4 ++-- integration/container/wait_test.go | 4 ++-- integration/daemon/daemon_linux_test.go | 4 ++-- integration/daemon/daemon_test.go | 4 ++-- integration/daemon/default_storage_test.go | 4 ++-- integration/daemon/main_test.go | 2 +- integration/daemon/migration_test.go | 6 +++--- integration/image/commit_test.go | 2 +- integration/image/history_test.go | 4 ++-- integration/image/import_test.go | 4 ++-- integration/image/list_test.go | 4 ++-- integration/image/main_test.go | 4 ++-- integration/image/prune_test.go | 4 ++-- integration/image/pull_test.go | 4 ++-- integration/image/save_test.go | 2 +- integration/internal/build/build.go | 2 +- integration/internal/swarm/service.go | 4 ++-- .../internal/testutils/networking/firewall.go | 2 +- integration/network/bridge/bridge_linux_test.go | 4 ++-- .../bridge/iptablesdoc/iptablesdoc_linux_test.go | 4 ++-- .../network/bridge/iptablesdoc/main_linux_test.go | 4 ++-- integration/network/bridge/main_test.go | 4 ++-- integration/network/bridge/netinit_linux_test.go | 2 +- .../network/bridge/nftablesdoc/main_linux_test.go | 4 ++-- .../bridge/nftablesdoc/nftablesdoc_linux_test.go | 4 ++-- integration/network/dns_test.go | 4 ++-- integration/network/helpers.go | 2 +- integration/network/inspect_test.go | 2 +- integration/network/ipvlan/ipvlan_test.go | 4 ++-- integration/network/ipvlan/main_test.go | 4 ++-- integration/network/macvlan/macvlan_test.go | 4 ++-- integration/network/macvlan/main_test.go | 4 ++-- integration/network/main_test.go | 4 ++-- integration/network/nat/main_windows_test.go | 4 ++-- integration/network/network_linux_test.go | 4 ++-- integration/network/network_test.go | 4 ++-- integration/network/overlay/main_test.go | 4 ++-- integration/network/overlay/overlay_test.go | 2 +- integration/network/service_test.go | 4 ++-- integration/networking/bridge_linux_test.go | 4 ++-- integration/networking/etchosts_test.go | 4 ++-- integration/networking/firewall_linux_test.go | 4 ++-- integration/networking/mac_addr_test.go | 4 ++-- integration/networking/main_test.go | 4 ++-- integration/networking/nat_windows_test.go | 2 +- integration/networking/port_mapping_linux_test.go | 4 ++-- integration/networking/resolvconf_test.go | 2 +- integration/plugin/authz/authz_plugin_test.go | 2 +- integration/plugin/authz/main_test.go | 6 +++--- integration/plugin/common/main_test.go | 4 ++-- integration/plugin/common/plugin_test.go | 10 +++++----- integration/plugin/logging/helpers_test.go | 2 +- integration/plugin/logging/logging_linux_test.go | 4 ++-- integration/plugin/logging/main_test.go | 4 ++-- integration/plugin/logging/read_test.go | 4 ++-- integration/plugin/logging/validation_test.go | 4 ++-- integration/plugin/volumes/helpers_test.go | 2 +- integration/plugin/volumes/main_test.go | 4 ++-- integration/plugin/volumes/mounts_test.go | 6 +++--- integration/secret/main_test.go | 4 ++-- integration/secret/secret_test.go | 2 +- integration/service/create_test.go | 4 ++-- integration/service/main_test.go | 4 ++-- integration/service/network_linux_test.go | 2 +- integration/service/plugin_test.go | 6 +++--- integration/service/update_test.go | 2 +- integration/session/main_test.go | 4 ++-- integration/session/session_test.go | 2 +- integration/system/cgroupdriver_systemd_test.go | 4 ++-- integration/system/disk_usage_test.go | 4 ++-- integration/system/event_test.go | 2 +- integration/system/info_linux_test.go | 2 +- integration/system/info_test.go | 4 ++-- integration/system/main_test.go | 4 ++-- integration/system/ping_test.go | 6 +++--- integration/system/version_test.go | 2 +- integration/volume/main_test.go | 4 ++-- integration/volume/mount_test.go | 2 +- integration/volume/volume_test.go | 8 ++++---- internal/test/suite/suite.go | 2 +- {testutil => internal/testutil}/daemon/config.go | 0 {testutil => internal/testutil}/daemon/container.go | 0 {testutil => internal/testutil}/daemon/daemon.go | 2 +- .../testutil}/daemon/daemon_freebsd.go | 0 .../testutil}/daemon/daemon_linux.go | 0 .../testutil}/daemon/daemon_unix.go | 0 .../testutil}/daemon/daemon_windows.go | 0 {testutil => internal/testutil}/daemon/doc.go | 0 {testutil => internal/testutil}/daemon/node.go | 0 {testutil => internal/testutil}/daemon/ops.go | 2 +- {testutil => internal/testutil}/daemon/plugin.go | 0 {testutil => internal/testutil}/daemon/secret.go | 0 {testutil => internal/testutil}/daemon/service.go | 0 {testutil => internal/testutil}/daemon/swarm.go | 0 {testutil => internal/testutil}/doc.go | 0 {testutil => internal/testutil}/environment/clean.go | 0 .../testutil}/environment/environment.go | 2 +- .../testutil}/environment/protect.go | 2 +- .../testutil}/environment/protect_linux.go | 0 .../testutil}/environment/protect_others.go | 0 .../testutil}/fakecontext/context.go | 0 {testutil => internal/testutil}/fakegit/fakegit.go | 4 ++-- .../testutil}/fakestorage/fixtures.go | 0 .../testutil}/fakestorage/storage.go | 8 ++++---- .../testutil}/fixtures/load/frozen.go | 0 .../testutil}/fixtures/plugin/basic/basic.go | 0 .../testutil}/fixtures/plugin/plugin.go | 2 +- {testutil => internal/testutil}/helper.go | 0 {testutil => internal/testutil}/helpers.go | 0 {testutil => internal/testutil}/registry/ops.go | 0 {testutil => internal/testutil}/registry/registry.go | 0 .../testutil}/registry/registry_mock.go | 0 {testutil => internal/testutil}/request/npipe.go | 0 .../testutil}/request/npipe_windows.go | 0 {testutil => internal/testutil}/request/ops.go | 0 {testutil => internal/testutil}/request/request.go | 2 +- {testutil => internal/testutil}/stringutils.go | 0 {testutil => internal/testutil}/stringutils_test.go | 0 {testutil => internal/testutil}/temp_files.go | 0 205 files changed, 308 insertions(+), 308 deletions(-) rename {testutil => internal/testutil}/daemon/config.go (100%) rename {testutil => internal/testutil}/daemon/container.go (100%) rename {testutil => internal/testutil}/daemon/daemon.go (99%) rename {testutil => internal/testutil}/daemon/daemon_freebsd.go (100%) rename {testutil => internal/testutil}/daemon/daemon_linux.go (100%) rename {testutil => internal/testutil}/daemon/daemon_unix.go (100%) rename {testutil => internal/testutil}/daemon/daemon_windows.go (100%) rename {testutil => internal/testutil}/daemon/doc.go (100%) rename {testutil => internal/testutil}/daemon/node.go (100%) rename {testutil => internal/testutil}/daemon/ops.go (98%) rename {testutil => internal/testutil}/daemon/plugin.go (100%) rename {testutil => internal/testutil}/daemon/secret.go (100%) rename {testutil => internal/testutil}/daemon/service.go (100%) rename {testutil => internal/testutil}/daemon/swarm.go (100%) rename {testutil => internal/testutil}/doc.go (100%) rename {testutil => internal/testutil}/environment/clean.go (100%) rename {testutil => internal/testutil}/environment/environment.go (99%) rename {testutil => internal/testutil}/environment/protect.go (99%) rename {testutil => internal/testutil}/environment/protect_linux.go (100%) rename {testutil => internal/testutil}/environment/protect_others.go (100%) rename {testutil => internal/testutil}/fakecontext/context.go (100%) rename {testutil => internal/testutil}/fakegit/fakegit.go (96%) rename {testutil => internal/testutil}/fakestorage/fixtures.go (100%) rename {testutil => internal/testutil}/fakestorage/storage.go (95%) rename {testutil => internal/testutil}/fixtures/load/frozen.go (100%) rename {testutil => internal/testutil}/fixtures/plugin/basic/basic.go (100%) rename {testutil => internal/testutil}/fixtures/plugin/plugin.go (99%) rename {testutil => internal/testutil}/helper.go (100%) rename {testutil => internal/testutil}/helpers.go (100%) rename {testutil => internal/testutil}/registry/ops.go (100%) rename {testutil => internal/testutil}/registry/registry.go (100%) rename {testutil => internal/testutil}/registry/registry_mock.go (100%) rename {testutil => internal/testutil}/request/npipe.go (100%) rename {testutil => internal/testutil}/request/npipe_windows.go (100%) rename {testutil => internal/testutil}/request/ops.go (100%) rename {testutil => internal/testutil}/request/request.go (99%) rename {testutil => internal/testutil}/stringutils.go (100%) rename {testutil => internal/testutil}/stringutils_test.go (100%) rename {testutil => internal/testutil}/temp_files.go (100%) diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index acc2002f67..87e0d06db3 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -18,12 +18,12 @@ import ( "github.com/moby/moby/v2/integration-cli/daemon" "github.com/moby/moby/v2/integration-cli/environment" "github.com/moby/moby/v2/internal/test/suite" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" - ienv "github.com/moby/moby/v2/testutil/environment" - "github.com/moby/moby/v2/testutil/fakestorage" - "github.com/moby/moby/v2/testutil/fixtures/plugin" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" + ienv "github.com/moby/moby/v2/internal/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/fakestorage" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil/registry" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/integration-cli/cli/build/build.go b/integration-cli/cli/build/build.go index d48eb841d6..ec3a7b6b36 100644 --- a/integration-cli/cli/build/build.go +++ b/integration-cli/cli/build/build.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/icmd" ) diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index 943d2710f7..5a44de2a5f 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -9,7 +9,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/stringid" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/pkg/errors" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go index c8b2d1befc..8a4bf12b58 100644 --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -15,8 +15,8 @@ import ( "github.com/moby/moby/api/types" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "github.com/pkg/errors" "golang.org/x/net/websocket" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 09cf93ba45..f8e65d03aa 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -12,11 +12,11 @@ import ( "testing" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/fakegit" - "github.com/moby/moby/v2/testutil/fakestorage" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakegit" + "github.com/moby/moby/v2/internal/testutil/fakestorage" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_api_build_windows_test.go b/integration-cli/docker_api_build_windows_test.go index 3c9d0dec1a..ae99541626 100644 --- a/integration-cli/docker_api_build_windows_test.go +++ b/integration-cli/docker_api_build_windows_test.go @@ -6,9 +6,9 @@ import ( "net/http" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index 5697687aa3..3af87a271e 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -25,8 +25,8 @@ import ( "github.com/moby/moby/v2/daemon/volume" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go index 3a6d227eca..b7419e05e4 100644 --- a/integration-cli/docker_api_containers_windows_test.go +++ b/integration-cli/docker_api_containers_windows_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/mount" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_api_exec_resize_test.go b/integration-cli/docker_api_exec_resize_test.go index 51bd96bec3..3dcc9e2327 100644 --- a/integration-cli/docker_api_exec_resize_test.go +++ b/integration-cli/docker_api_exec_resize_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index 09bfc0db24..d691f2c13a 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -16,8 +16,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 4d29db7ee8..9773f6dbd8 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -9,8 +9,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index c1034d37be..e0daf734ed 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -8,7 +8,7 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index 7864d6386e..ee1f96a5c6 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -14,8 +14,8 @@ import ( "github.com/moby/moby/api/pkg/stdcopy" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go index a230e554d1..0188e5b7d4 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -13,8 +13,8 @@ import ( "github.com/moby/moby/api/types/network" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index fce3b53639..d4c751d16b 100644 --- a/integration-cli/docker_api_stats_test.go +++ b/integration-cli/docker_api_stats_test.go @@ -15,8 +15,8 @@ import ( "github.com/moby/moby/api/types/system" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration-cli/docker_api_swarm_node_test.go b/integration-cli/docker_api_swarm_node_test.go index 051330cd42..f2bc108241 100644 --- a/integration-cli/docker_api_swarm_node_test.go +++ b/integration-cli/docker_api_swarm_node_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/poll" ) diff --git a/integration-cli/docker_api_swarm_service_test.go b/integration-cli/docker_api_swarm_service_test.go index 2924001beb..ef531b6b62 100644 --- a/integration-cli/docker_api_swarm_service_test.go +++ b/integration-cli/docker_api_swarm_service_test.go @@ -15,8 +15,8 @@ import ( "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 93a12b99a3..b892bf2e36 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -24,9 +24,9 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/request" "github.com/moby/swarmkit/v2/ca" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index f7148e34ac..4448f141f7 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 4a4fb4815a..c543c5eba6 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -24,10 +24,10 @@ import ( "github.com/moby/moby/api/types/versions" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/fakegit" - "github.com/moby/moby/v2/testutil/fakestorage" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakegit" + "github.com/moby/moby/v2/internal/testutil/fakestorage" "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index df8315462c..b42a0665ee 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -18,7 +18,7 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go index ecc3bff55a..d686b2df26 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -12,7 +12,7 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index c287851dae..d6a2374ff9 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -31,8 +31,8 @@ import ( "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/sys/mount" "golang.org/x/sys/unix" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index 3f02337f0d..cb308fddca 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -18,7 +18,7 @@ import ( eventstestutils "github.com/moby/moby/v2/daemon/events/testutils" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index 6b0a1fd320..502ef9d6f7 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -18,7 +18,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go index 1a38cf1932..9a4b821dbb 100644 --- a/integration-cli/docker_cli_external_volume_driver_test.go +++ b/integration-cli/docker_cli_external_volume_driver_test.go @@ -20,9 +20,9 @@ import ( "github.com/moby/moby/v2/daemon/volume" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/pkg/plugins" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_info_unix_test.go b/integration-cli/docker_cli_info_unix_test.go index a886e9b20f..26ebb8f49a 100644 --- a/integration-cli/docker_cli_info_unix_test.go +++ b/integration-cli/docker_cli_info_unix_test.go @@ -7,7 +7,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/daemon/config" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_logout_test.go b/integration-cli/docker_cli_logout_test.go index 8008f9dcb5..47d09d84f9 100644 --- a/integration-cli/docker_cli_logout_test.go +++ b/integration-cli/docker_cli_logout_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index adecb609c6..c0af4e73f8 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -13,8 +13,8 @@ import ( "github.com/containerd/log" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 43c43a7ecf..3a0c194e24 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -25,9 +25,9 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/pkg/plugins" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_cli_plugins_logdriver_test.go b/integration-cli/docker_cli_plugins_logdriver_test.go index 0cd3183353..c36450169e 100644 --- a/integration-cli/docker_cli_plugins_logdriver_test.go +++ b/integration-cli/docker_cli_plugins_logdriver_test.go @@ -7,7 +7,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 1156621ab6..d2f2815147 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -15,8 +15,8 @@ import ( plugintypes "github.com/moby/moby/api/types/plugin" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index 4d6dd60f97..5ff8b9696b 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go index 8b4ef1dca4..4f1e56be0d 100644 --- a/integration-cli/docker_cli_prune_unix_test.go +++ b/integration-cli/docker_cli_prune_unix_test.go @@ -15,7 +15,7 @@ import ( "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_registry_user_agent_test.go b/integration-cli/docker_cli_registry_user_agent_test.go index 8e1f01abb1..0f3337a8e7 100644 --- a/integration-cli/docker_cli_registry_user_agent_test.go +++ b/integration-cli/docker_cli_registry_user_agent_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/registry" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index ee5a819c23..bbf5f06fff 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -29,10 +29,10 @@ import ( "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" "github.com/moby/moby/v2/integration-cli/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "github.com/moby/moby/v2/internal/testutils/specialimage" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fakecontext" "github.com/moby/sys/mountinfo" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 69040b114f..14b10761c4 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -20,8 +20,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" + "github.com/moby/moby/v2/internal/testutil" "github.com/moby/moby/v2/pkg/sysinfo" - "github.com/moby/moby/v2/testutil" "github.com/moby/profiles/seccomp" "github.com/moby/sys/mount" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go index d715fc1b4f..aac9be040e 100644 --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -14,7 +14,7 @@ import ( "github.com/creack/pty" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_service_create_test.go b/integration-cli/docker_cli_service_create_test.go index a5888c901c..8c946a163f 100644 --- a/integration-cli/docker_cli_service_create_test.go +++ b/integration-cli/docker_cli_service_create_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/api/types/mount" "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/v2/integration-cli/checker" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_cli_service_health_test.go b/integration-cli/docker_cli_service_health_test.go index 50adc1c5ab..d478b7bc35 100644 --- a/integration-cli/docker_cli_service_health_test.go +++ b/integration-cli/docker_cli_service_health_test.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go index 8893f391c9..58807630de 100644 --- a/integration-cli/docker_cli_service_logs_test.go +++ b/integration-cli/docker_cli_service_logs_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/daemon" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go index d14d124c65..5923643675 100644 --- a/integration-cli/docker_cli_service_scale_test.go +++ b/integration-cli/docker_cli_service_scale_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 77210c532b..8d72b80545 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -28,9 +28,9 @@ import ( "github.com/moby/moby/v2/integration-cli/checker" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" + "github.com/moby/moby/v2/internal/testutil" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/pkg/plugins" - "github.com/moby/moby/v2/testutil" - testdaemon "github.com/moby/moby/v2/testutil/daemon" "github.com/moby/swarmkit/v2/ca/keyutils" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_cli_swarm_unix_test.go b/integration-cli/docker_cli_swarm_unix_test.go index 68648e469d..e21e6f6355 100644 --- a/integration-cli/docker_cli_swarm_unix_test.go +++ b/integration-cli/docker_cli_swarm_unix_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/v2/integration-cli/checker" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/poll" ) diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index 4559188a52..faa19a093d 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -15,8 +15,8 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go index c224492ff4..ccdcc0b52d 100644 --- a/integration-cli/docker_cli_userns_test.go +++ b/integration-cli/docker_cli_userns_test.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/moby/moby/client/pkg/stringid" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_v2_only_test.go b/integration-cli/docker_cli_v2_only_test.go index 3f5668333f..28830e6d8a 100644 --- a/integration-cli/docker_cli_v2_only_test.go +++ b/integration-cli/docker_cli_v2_only_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil/registry" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_cli_volume_test.go b/integration-cli/docker_cli_volume_test.go index 88c71dc710..149bca715b 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -15,7 +15,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index bfebb96580..f6741075f7 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/daemon" - testdaemon "github.com/moby/moby/v2/testutil/daemon" + testdaemon "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 79f469ada9..77aec00255 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -20,8 +20,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/daemon" + "github.com/moby/moby/v2/internal/testutil" "github.com/moby/moby/v2/internal/testutils/specialimage" - "github.com/moby/moby/v2/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/environment/environment.go b/integration-cli/environment/environment.go index f3b60f4e05..1cfb4aa544 100644 --- a/integration-cli/environment/environment.go +++ b/integration-cli/environment/environment.go @@ -5,7 +5,7 @@ import ( "os" "os/exec" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/environment" ) // DefaultClientBinary is the name of the docker binary diff --git a/integration-cli/fixtures_linux_daemon_test.go b/integration-cli/fixtures_linux_daemon_test.go index fa0c07bbf6..93ce690270 100644 --- a/integration-cli/fixtures_linux_daemon_test.go +++ b/integration-cli/fixtures_linux_daemon_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil/fixtures/load" + "github.com/moby/moby/v2/internal/testutil/fixtures/load" "gotest.tools/v3/assert" ) diff --git a/integration-cli/requirements_test.go b/integration-cli/requirements_test.go index f6d25d7374..2d404ed936 100644 --- a/integration-cli/requirements_test.go +++ b/integration-cli/requirements_test.go @@ -19,7 +19,7 @@ import ( "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil/registry" ) func DaemonIsWindows() bool { diff --git a/integration-cli/utils_test.go b/integration-cli/utils_test.go index 9d43d5edfb..d8e8c3f54a 100644 --- a/integration-cli/utils_test.go +++ b/integration-cli/utils_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "github.com/pkg/errors" "gotest.tools/v3/icmd" ) diff --git a/integration/build/build_cgroupns_linux_test.go b/integration/build/build_cgroupns_linux_test.go index f4bf3cbf39..1a247a4baf 100644 --- a/integration/build/build_cgroupns_linux_test.go +++ b/integration/build/build_cgroupns_linux_test.go @@ -10,9 +10,9 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" "github.com/moby/moby/v2/integration/internal/requirement" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/build/build_squash_test.go b/integration/build/build_squash_test.go index 3c1c4b8471..64e6bd52e9 100644 --- a/integration/build/build_squash_test.go +++ b/integration/build/build_squash_test.go @@ -9,9 +9,9 @@ import ( "github.com/moby/moby/api/pkg/stdcopy" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/build/build_test.go b/integration/build/build_test.go index 9f2ae882f0..9bcc5c1c62 100644 --- a/integration/build/build_test.go +++ b/integration/build/build_test.go @@ -21,8 +21,8 @@ import ( "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/build/build_traces_test.go b/integration/build/build_traces_test.go index 2996db069f..29b39d03eb 100644 --- a/integration/build/build_traces_test.go +++ b/integration/build/build_traces_test.go @@ -11,7 +11,7 @@ import ( "github.com/moby/buildkit/client" "github.com/moby/buildkit/client/llb" "github.com/moby/buildkit/util/progress/progressui" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" sdktrace "go.opentelemetry.io/otel/sdk/trace" "golang.org/x/sync/errgroup" "gotest.tools/v3/assert" diff --git a/integration/build/build_userns_linux_test.go b/integration/build/build_userns_linux_test.go index 9437f729e1..591fc006bf 100644 --- a/integration/build/build_userns_linux_test.go +++ b/integration/build/build_userns_linux_test.go @@ -13,10 +13,10 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/fixtures/load" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fixtures/load" "gotest.tools/v3/assert" "gotest.tools/v3/poll" "gotest.tools/v3/skip" diff --git a/integration/build/main_test.go b/integration/build/main_test.go index e4e5f7c9d7..bc8bd58792 100644 --- a/integration/build/main_test.go +++ b/integration/build/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/capabilities/capabilities_linux_test.go b/integration/capabilities/capabilities_linux_test.go index bd6f0c670b..2bf06ee4a6 100644 --- a/integration/capabilities/capabilities_linux_test.go +++ b/integration/capabilities/capabilities_linux_test.go @@ -10,8 +10,8 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" "gotest.tools/v3/poll" ) diff --git a/integration/capabilities/main_linux_test.go b/integration/capabilities/main_linux_test.go index d582099f53..050f8f8e3c 100644 --- a/integration/capabilities/main_linux_test.go +++ b/integration/capabilities/main_linux_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/config/config_test.go b/integration/config/config_test.go index 827a3158a5..412f148732 100644 --- a/integration/config/config_test.go +++ b/integration/config/config_test.go @@ -15,7 +15,7 @@ import ( swarmtypes "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/config/main_test.go b/integration/config/main_test.go index 7a39eb9206..6f9c151be1 100644 --- a/integration/config/main_test.go +++ b/integration/config/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/container/attach_test.go b/integration/container/attach_test.go index 8e69f04bae..c26ae78d70 100644 --- a/integration/container/attach_test.go +++ b/integration/container/attach_test.go @@ -9,8 +9,8 @@ import ( "github.com/moby/moby/api/types/network" "github.com/moby/moby/client" systemutil "github.com/moby/moby/v2/integration/internal/system" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/cdi_test.go b/integration/container/cdi_test.go index 695372bcae..9178ba9453 100644 --- a/integration/container/cdi_test.go +++ b/integration/container/cdi_test.go @@ -13,8 +13,8 @@ import ( "github.com/moby/moby/api/types/system" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/checkpoint_test.go b/integration/container/checkpoint_test.go index a2ec3f99ac..b178e4378d 100644 --- a/integration/container/checkpoint_test.go +++ b/integration/container/checkpoint_test.go @@ -10,7 +10,7 @@ import ( mounttypes "github.com/moby/moby/api/types/mount" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/container_test.go b/integration/container/container_test.go index 5acaccd703..93d0cabeeb 100644 --- a/integration/container/container_test.go +++ b/integration/container/container_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/container/copy_test.go b/integration/container/copy_test.go index 8b344a30f9..e82117c3b8 100644 --- a/integration/container/copy_test.go +++ b/integration/container/copy_test.go @@ -18,7 +18,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/container/create_test.go b/integration/container/create_test.go index 2cf75bb9f4..c1327ebb03 100644 --- a/integration/container/create_test.go +++ b/integration/container/create_test.go @@ -19,7 +19,7 @@ import ( "github.com/moby/moby/v2/daemon/pkg/oci" testContainer "github.com/moby/moby/v2/integration/internal/container" net "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/container/daemon_linux_test.go b/integration/container/daemon_linux_test.go index 99eff0f2bd..2de8eb2198 100644 --- a/integration/container/daemon_linux_test.go +++ b/integration/container/daemon_linux_test.go @@ -13,8 +13,8 @@ import ( "github.com/moby/moby/client" realcontainer "github.com/moby/moby/v2/daemon/container" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/container/daemon_test.go b/integration/container/daemon_test.go index 74228156f8..f4482a0bd9 100644 --- a/integration/container/daemon_test.go +++ b/integration/container/daemon_test.go @@ -6,8 +6,8 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/container/devices_windows_test.go b/integration/container/devices_windows_test.go index 80f5ce783d..a395f8dc91 100644 --- a/integration/container/devices_windows_test.go +++ b/integration/container/devices_windows_test.go @@ -7,7 +7,7 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/container/exec_test.go b/integration/container/exec_test.go index 39dfa67a4b..90e7b40caf 100644 --- a/integration/container/exec_test.go +++ b/integration/container/exec_test.go @@ -16,8 +16,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/build" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/fakecontext" - req "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + req "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/container/export_test.go b/integration/container/export_test.go index cc0d935de3..1023afad43 100644 --- a/integration/container/export_test.go +++ b/integration/container/export_test.go @@ -9,8 +9,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/inspect_test.go b/integration/container/inspect_test.go index 7b3200b025..b6e1c53701 100644 --- a/integration/container/inspect_test.go +++ b/integration/container/inspect_test.go @@ -9,7 +9,7 @@ import ( "github.com/containerd/platforms" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/container/ipcmode_linux_test.go b/integration/container/ipcmode_linux_test.go index 357786f154..c08827e2a8 100644 --- a/integration/container/ipcmode_linux_test.go +++ b/integration/container/ipcmode_linux_test.go @@ -11,9 +11,9 @@ import ( "github.com/moby/moby/api/types/versions" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/fs" diff --git a/integration/container/kill_test.go b/integration/container/kill_test.go index 411d05d4de..6ec4669f34 100644 --- a/integration/container/kill_test.go +++ b/integration/container/kill_test.go @@ -6,8 +6,8 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/list_test.go b/integration/container/list_test.go index d777f4d10f..af7c271e6d 100644 --- a/integration/container/list_test.go +++ b/integration/container/list_test.go @@ -11,8 +11,8 @@ import ( "github.com/moby/moby/api/types/versions" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/main_test.go b/integration/container/main_test.go index 93781bbdc6..deda74911a 100644 --- a/integration/container/main_test.go +++ b/integration/container/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/container/mounts_linux_test.go b/integration/container/mounts_linux_test.go index 60d8a6c2ac..3ef2bf74dc 100644 --- a/integration/container/mounts_linux_test.go +++ b/integration/container/mounts_linux_test.go @@ -16,8 +16,8 @@ import ( "github.com/moby/moby/v2/daemon/config" "github.com/moby/moby/v2/daemon/volume" "github.com/moby/moby/v2/integration/internal/container" + "github.com/moby/moby/v2/internal/testutil" "github.com/moby/moby/v2/pkg/parsers/kernel" - "github.com/moby/moby/v2/testutil" "github.com/moby/sys/mount" "github.com/moby/sys/mountinfo" "gotest.tools/v3/assert" diff --git a/integration/container/pause_test.go b/integration/container/pause_test.go index d510bdaacd..a1bd25bff8 100644 --- a/integration/container/pause_test.go +++ b/integration/container/pause_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/api/types/filters" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/resize_test.go b/integration/container/resize_test.go index 4c05a1ec22..0f32883896 100644 --- a/integration/container/resize_test.go +++ b/integration/container/resize_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/api/types/common" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - req "github.com/moby/moby/v2/testutil/request" + req "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/container/restart_test.go b/integration/container/restart_test.go index 370e933b6b..7bd304b911 100644 --- a/integration/container/restart_test.go +++ b/integration/container/restart_test.go @@ -12,8 +12,8 @@ import ( "github.com/moby/moby/api/types/filters" "github.com/moby/moby/client" testContainer "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/container/run_cgroupns_linux_test.go b/integration/container/run_cgroupns_linux_test.go index 65fb87e0de..3dd4a7022d 100644 --- a/integration/container/run_cgroupns_linux_test.go +++ b/integration/container/run_cgroupns_linux_test.go @@ -7,8 +7,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/requirement" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/container/run_linux_test.go b/integration/container/run_linux_test.go index d61a14c266..07578c63df 100644 --- a/integration/container/run_linux_test.go +++ b/integration/container/run_linux_test.go @@ -17,8 +17,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" net "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/container/update_linux_test.go b/integration/container/update_linux_test.go index 7ae9c8a0f8..3fd5d2c6c1 100644 --- a/integration/container/update_linux_test.go +++ b/integration/container/update_linux_test.go @@ -10,8 +10,8 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/container/wait_test.go b/integration/container/wait_test.go index 45b83300ff..ea832f8828 100644 --- a/integration/container/wait_test.go +++ b/integration/container/wait_test.go @@ -7,8 +7,8 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/daemon/daemon_linux_test.go b/integration/daemon/daemon_linux_test.go index 986b7308d9..94b49b651e 100644 --- a/integration/daemon/daemon_linux_test.go +++ b/integration/daemon/daemon_linux_test.go @@ -12,8 +12,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/daemon/daemon_test.go b/integration/daemon/daemon_test.go index c5db40cb97..6b75b69318 100644 --- a/integration/daemon/daemon_test.go +++ b/integration/daemon/daemon_test.go @@ -23,8 +23,8 @@ import ( "github.com/moby/moby/v2/daemon/config" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/process" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/daemon/default_storage_test.go b/integration/daemon/default_storage_test.go index 40431ece4f..498950e5a7 100644 --- a/integration/daemon/default_storage_test.go +++ b/integration/daemon/default_storage_test.go @@ -4,8 +4,8 @@ import ( "testing" containertypes "github.com/moby/moby/api/types/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/daemon/main_test.go b/integration/daemon/main_test.go index 5fa2f61a9d..a20349c9a7 100644 --- a/integration/daemon/main_test.go +++ b/integration/daemon/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/daemon/migration_test.go b/integration/daemon/migration_test.go index 14fce58669..1307384b90 100644 --- a/integration/daemon/migration_test.go +++ b/integration/daemon/migration_test.go @@ -8,9 +8,9 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fixtures/load" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fixtures/load" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go index 31c3d613a5..4757071052 100644 --- a/integration/image/commit_test.go +++ b/integration/image/commit_test.go @@ -7,7 +7,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/image/history_test.go b/integration/image/history_test.go index de2d2f6187..d04c2c741b 100644 --- a/integration/image/history_test.go +++ b/integration/image/history_test.go @@ -9,8 +9,8 @@ import ( buildtypes "github.com/moby/moby/api/types/build" "github.com/moby/moby/client" build "github.com/moby/moby/v2/integration/internal/build" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/fakecontext" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/import_test.go b/integration/image/import_test.go index ba3652424a..fed7ace5d1 100644 --- a/integration/image/import_test.go +++ b/integration/image/import_test.go @@ -12,8 +12,8 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/image/list_test.go b/integration/image/list_test.go index d4e09e02cc..f2f81db22a 100644 --- a/integration/image/list_test.go +++ b/integration/image/list_test.go @@ -15,9 +15,9 @@ import ( "github.com/moby/moby/v2/daemon/config" "github.com/moby/moby/v2/integration/internal/container" iimage "github.com/moby/moby/v2/integration/internal/image" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/internal/testutils/specialimage" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/main_test.go b/integration/image/main_test.go index cd7b2cda5c..9e7baaf238 100644 --- a/integration/image/main_test.go +++ b/integration/image/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/image/prune_test.go b/integration/image/prune_test.go index bcbb0ea88d..ff00a0da56 100644 --- a/integration/image/prune_test.go +++ b/integration/image/prune_test.go @@ -9,9 +9,9 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" iimage "github.com/moby/moby/v2/integration/internal/image" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/internal/testutils/specialimage" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/image/pull_test.go b/integration/image/pull_test.go index 76a1cc4a45..d3fada4d71 100644 --- a/integration/image/pull_test.go +++ b/integration/image/pull_test.go @@ -18,8 +18,8 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/registry" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/image/save_test.go b/integration/image/save_test.go index a284628d3d..cafb8a1fa9 100644 --- a/integration/image/save_test.go +++ b/integration/image/save_test.go @@ -20,9 +20,9 @@ import ( "github.com/moby/moby/v2/integration/internal/build" "github.com/moby/moby/v2/integration/internal/container" iimage "github.com/moby/moby/v2/integration/internal/image" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "github.com/moby/moby/v2/internal/testutils" "github.com/moby/moby/v2/internal/testutils/specialimage" - "github.com/moby/moby/v2/testutil/fakecontext" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/integration/internal/build/build.go b/integration/internal/build/build.go index 40ae23bb91..a435f42076 100644 --- a/integration/internal/build/build.go +++ b/integration/internal/build/build.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/api/types/build" "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" ) diff --git a/integration/internal/swarm/service.go b/integration/internal/swarm/service.go index 69da3fcafb..470aa15381 100644 --- a/integration/internal/swarm/service.go +++ b/integration/internal/swarm/service.go @@ -10,8 +10,8 @@ import ( "github.com/moby/moby/api/types/filters" swarmtypes "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/environment" "gotest.tools/v3/assert" "gotest.tools/v3/poll" "gotest.tools/v3/skip" diff --git a/integration/internal/testutils/networking/firewall.go b/integration/internal/testutils/networking/firewall.go index 0c03087fc3..358c3115eb 100644 --- a/integration/internal/testutils/networking/firewall.go +++ b/integration/internal/testutils/networking/firewall.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/network/bridge/bridge_linux_test.go b/integration/network/bridge/bridge_linux_test.go index 7c31a019db..9e470309c8 100644 --- a/integration/network/bridge/bridge_linux_test.go +++ b/integration/network/bridge/bridge_linux_test.go @@ -21,8 +21,8 @@ import ( ctr "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/network/bridge/iptablesdoc/iptablesdoc_linux_test.go b/integration/network/bridge/iptablesdoc/iptablesdoc_linux_test.go index 64bd3f754b..d654fca6eb 100644 --- a/integration/network/bridge/iptablesdoc/iptablesdoc_linux_test.go +++ b/integration/network/bridge/iptablesdoc/iptablesdoc_linux_test.go @@ -37,8 +37,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" "gotest.tools/v3/golden" diff --git a/integration/network/bridge/iptablesdoc/main_linux_test.go b/integration/network/bridge/iptablesdoc/main_linux_test.go index 56f8660d65..b0bf072d2e 100644 --- a/integration/network/bridge/iptablesdoc/main_linux_test.go +++ b/integration/network/bridge/iptablesdoc/main_linux_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/bridge/main_test.go b/integration/network/bridge/main_test.go index af1f9105da..3471b48a12 100644 --- a/integration/network/bridge/main_test.go +++ b/integration/network/bridge/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/bridge/netinit_linux_test.go b/integration/network/bridge/netinit_linux_test.go index f7f162eb37..ff69c6f31d 100644 --- a/integration/network/bridge/netinit_linux_test.go +++ b/integration/network/bridge/netinit_linux_test.go @@ -5,7 +5,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/network/bridge/nftablesdoc/main_linux_test.go b/integration/network/bridge/nftablesdoc/main_linux_test.go index fc7b0a1778..cf644aa8b7 100644 --- a/integration/network/bridge/nftablesdoc/main_linux_test.go +++ b/integration/network/bridge/nftablesdoc/main_linux_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/bridge/nftablesdoc/nftablesdoc_linux_test.go b/integration/network/bridge/nftablesdoc/nftablesdoc_linux_test.go index c668832542..e9890e92e5 100644 --- a/integration/network/bridge/nftablesdoc/nftablesdoc_linux_test.go +++ b/integration/network/bridge/nftablesdoc/nftablesdoc_linux_test.go @@ -35,8 +35,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" "gotest.tools/v3/golden" diff --git a/integration/network/dns_test.go b/integration/network/dns_test.go index 3eba5765c6..33f3deb208 100644 --- a/integration/network/dns_test.go +++ b/integration/network/dns_test.go @@ -6,8 +6,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/network/helpers.go b/integration/network/helpers.go index 20916a212a..355ae88b3f 100644 --- a/integration/network/helpers.go +++ b/integration/network/helpers.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" ) diff --git a/integration/network/inspect_test.go b/integration/network/inspect_test.go index b9c084b080..636ca9ce33 100644 --- a/integration/network/inspect_test.go +++ b/integration/network/inspect_test.go @@ -6,7 +6,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/poll" "gotest.tools/v3/skip" diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index 6e21bbf575..e1249eafd0 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -15,8 +15,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" net "github.com/moby/moby/v2/integration/internal/network" n "github.com/moby/moby/v2/integration/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/network/ipvlan/main_test.go b/integration/network/ipvlan/main_test.go index 99099b389e..e2450c2499 100644 --- a/integration/network/ipvlan/main_test.go +++ b/integration/network/ipvlan/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/macvlan/macvlan_test.go b/integration/network/macvlan/macvlan_test.go index 24a1ad5be1..0fc0490ca7 100644 --- a/integration/network/macvlan/macvlan_test.go +++ b/integration/network/macvlan/macvlan_test.go @@ -14,8 +14,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" net "github.com/moby/moby/v2/integration/internal/network" n "github.com/moby/moby/v2/integration/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/network/macvlan/main_test.go b/integration/network/macvlan/main_test.go index bb6d0ccd83..388e3351c1 100644 --- a/integration/network/macvlan/main_test.go +++ b/integration/network/macvlan/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/integration/network/main_test.go b/integration/network/main_test.go index be1dde1c84..a30634ec15 100644 --- a/integration/network/main_test.go +++ b/integration/network/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/nat/main_windows_test.go b/integration/network/nat/main_windows_test.go index d81bbfd87a..3530e522b5 100644 --- a/integration/network/nat/main_windows_test.go +++ b/integration/network/nat/main_windows_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/network/network_linux_test.go b/integration/network/network_linux_test.go index ba9faa39a0..4f936693f0 100644 --- a/integration/network/network_linux_test.go +++ b/integration/network/network_linux_test.go @@ -18,8 +18,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/network/network_test.go b/integration/network/network_test.go index f9f859504b..87470e86e1 100644 --- a/integration/network/network_test.go +++ b/integration/network/network_test.go @@ -6,8 +6,8 @@ import ( "testing" networktypes "github.com/moby/moby/api/types/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/network/overlay/main_test.go b/integration/network/overlay/main_test.go index 925f534bbb..de4116ba98 100644 --- a/integration/network/overlay/main_test.go +++ b/integration/network/overlay/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/integration/network/overlay/overlay_test.go b/integration/network/overlay/overlay_test.go index 066e101c50..f363ad1f28 100644 --- a/integration/network/overlay/overlay_test.go +++ b/integration/network/overlay/overlay_test.go @@ -17,7 +17,7 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/poll" "gotest.tools/v3/skip" diff --git a/integration/network/service_test.go b/integration/network/service_test.go index f7bfda62b6..6f197d5125 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -13,8 +13,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/networking/bridge_linux_test.go b/integration/networking/bridge_linux_test.go index 64689e1907..f301e4db9f 100644 --- a/integration/networking/bridge_linux_test.go +++ b/integration/networking/bridge_linux_test.go @@ -27,8 +27,8 @@ import ( "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" n "github.com/moby/moby/v2/integration/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/networking/etchosts_test.go b/integration/networking/etchosts_test.go index e7479fede6..09a44ff6ce 100644 --- a/integration/networking/etchosts_test.go +++ b/integration/networking/etchosts_test.go @@ -8,8 +8,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/integration/networking/firewall_linux_test.go b/integration/networking/firewall_linux_test.go index 64af7ebded..436b6d054e 100644 --- a/integration/networking/firewall_linux_test.go +++ b/integration/networking/firewall_linux_test.go @@ -6,8 +6,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/networking/mac_addr_test.go b/integration/networking/mac_addr_test.go index b93f1925d7..8c13fef240 100644 --- a/integration/networking/mac_addr_test.go +++ b/integration/networking/mac_addr_test.go @@ -7,8 +7,8 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/networking/main_test.go b/integration/networking/main_test.go index 909daa3a0d..e81a179f82 100644 --- a/integration/networking/main_test.go +++ b/integration/networking/main_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/networking/nat_windows_test.go b/integration/networking/nat_windows_test.go index 6aaed97698..b1d51c5833 100644 --- a/integration/networking/nat_windows_test.go +++ b/integration/networking/nat_windows_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/networking/port_mapping_linux_test.go b/integration/networking/port_mapping_linux_test.go index 81a7fc5d31..a32fb892c1 100644 --- a/integration/networking/port_mapping_linux_test.go +++ b/integration/networking/port_mapping_linux_test.go @@ -23,8 +23,8 @@ import ( "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/integration/networking/resolvconf_test.go b/integration/networking/resolvconf_test.go index 286143afa7..e011747cee 100644 --- a/integration/networking/resolvconf_test.go +++ b/integration/networking/resolvconf_test.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/network" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go index 2733567b10..c4b84453e5 100644 --- a/integration/plugin/authz/authz_plugin_test.go +++ b/integration/plugin/authz/authz_plugin_test.go @@ -22,8 +22,8 @@ import ( eventtypes "github.com/moby/moby/api/types/events" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" + "github.com/moby/moby/v2/internal/testutil/environment" "github.com/moby/moby/v2/pkg/authorization" - "github.com/moby/moby/v2/testutil/environment" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/plugin/authz/main_test.go b/integration/plugin/authz/main_test.go index 9063546686..f0a59cfa13 100644 --- a/integration/plugin/authz/main_test.go +++ b/integration/plugin/authz/main_test.go @@ -13,11 +13,11 @@ import ( "strings" "testing" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/environment" "github.com/moby/moby/v2/pkg/authorization" "github.com/moby/moby/v2/pkg/plugins" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/environment" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/integration/plugin/common/main_test.go b/integration/plugin/common/main_test.go index 8996ed80cb..36834965a9 100644 --- a/integration/plugin/common/main_test.go +++ b/integration/plugin/common/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/integration/plugin/common/plugin_test.go b/integration/plugin/common/plugin_test.go index 557ef3f1e8..edb77b8cfa 100644 --- a/integration/plugin/common/plugin_test.go +++ b/integration/plugin/common/plugin_test.go @@ -20,11 +20,11 @@ import ( "github.com/moby/moby/api/types/system" "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fixtures/plugin" - "github.com/moby/moby/v2/testutil/registry" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil/registry" + "github.com/moby/moby/v2/internal/testutil/request" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/plugin/logging/helpers_test.go b/integration/plugin/logging/helpers_test.go index fd47a00c73..34ed9e98cb 100644 --- a/integration/plugin/logging/helpers_test.go +++ b/integration/plugin/logging/helpers_test.go @@ -9,7 +9,7 @@ import ( "github.com/moby/locker" plugintypes "github.com/moby/moby/api/types/plugin" - "github.com/moby/moby/v2/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/integration/plugin/logging/logging_linux_test.go b/integration/plugin/logging/logging_linux_test.go index 79848e2f3a..654d49571c 100644 --- a/integration/plugin/logging/logging_linux_test.go +++ b/integration/plugin/logging/logging_linux_test.go @@ -10,8 +10,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/plugin/logging/main_test.go b/integration/plugin/logging/main_test.go index efc32ff496..d1ec40abcd 100644 --- a/integration/plugin/logging/main_test.go +++ b/integration/plugin/logging/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/plugin/logging/read_test.go b/integration/plugin/logging/read_test.go index cf5795be78..2844879332 100644 --- a/integration/plugin/logging/read_test.go +++ b/integration/plugin/logging/read_test.go @@ -11,8 +11,8 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" testContainer "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/poll" ) diff --git a/integration/plugin/logging/validation_test.go b/integration/plugin/logging/validation_test.go index 03cdd3d965..b98940d1cc 100644 --- a/integration/plugin/logging/validation_test.go +++ b/integration/plugin/logging/validation_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/plugin/volumes/helpers_test.go b/integration/plugin/volumes/helpers_test.go index 5864bcfa57..39b603f9af 100644 --- a/integration/plugin/volumes/helpers_test.go +++ b/integration/plugin/volumes/helpers_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/locker" plugintypes "github.com/moby/moby/api/types/plugin" - "github.com/moby/moby/v2/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/integration/plugin/volumes/main_test.go b/integration/plugin/volumes/main_test.go index 073c33fb9c..2443210fe7 100644 --- a/integration/plugin/volumes/main_test.go +++ b/integration/plugin/volumes/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/plugin/volumes/mounts_test.go b/integration/plugin/volumes/mounts_test.go index c1325df22c..17a6ab557f 100644 --- a/integration/plugin/volumes/mounts_test.go +++ b/integration/plugin/volumes/mounts_test.go @@ -6,9 +6,9 @@ import ( plugintypes "github.com/moby/moby/api/types/plugin" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/secret/main_test.go b/integration/secret/main_test.go index 90242bd82b..c32d32d086 100644 --- a/integration/secret/main_test.go +++ b/integration/secret/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/secret/secret_test.go b/integration/secret/secret_test.go index 721b3a5503..6372af25eb 100644 --- a/integration/secret/secret_test.go +++ b/integration/secret/secret_test.go @@ -15,7 +15,7 @@ import ( swarmtypes "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/service/create_test.go b/integration/service/create_test.go index da39be922b..189f12c8e5 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -14,8 +14,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/service/main_test.go b/integration/service/main_test.go index 7a8976484b..e5a8331a13 100644 --- a/integration/service/main_test.go +++ b/integration/service/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/service/network_linux_test.go b/integration/service/network_linux_test.go index 985970868d..cdea32bf05 100644 --- a/integration/service/network_linux_test.go +++ b/integration/service/network_linux_test.go @@ -15,7 +15,7 @@ import ( net "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" "github.com/moby/moby/v2/integration/internal/testutils/networking" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/integration/service/plugin_test.go b/integration/service/plugin_test.go index f3234882c9..47010cccb3 100644 --- a/integration/service/plugin_test.go +++ b/integration/service/plugin_test.go @@ -10,9 +10,9 @@ import ( swarmtypes "github.com/moby/moby/api/types/swarm" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fixtures/plugin" - "github.com/moby/moby/v2/testutil/registry" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fixtures/plugin" + "github.com/moby/moby/v2/internal/testutil/registry" "gotest.tools/v3/assert" "gotest.tools/v3/poll" "gotest.tools/v3/skip" diff --git a/integration/service/update_test.go b/integration/service/update_test.go index b42d345d02..9dad4fe1e8 100644 --- a/integration/service/update_test.go +++ b/integration/service/update_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/swarm" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration/session/main_test.go b/integration/session/main_test.go index 5ab18f8fbd..789e7c3ac1 100644 --- a/integration/session/main_test.go +++ b/integration/session/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/session/session_test.go b/integration/session/session_test.go index 544adb26a3..eb82db8872 100644 --- a/integration/session/session_test.go +++ b/integration/session/session_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - req "github.com/moby/moby/v2/testutil/request" + req "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/system/cgroupdriver_systemd_test.go b/integration/system/cgroupdriver_systemd_test.go index 762ae2c98c..48bd0e536e 100644 --- a/integration/system/cgroupdriver_systemd_test.go +++ b/integration/system/cgroupdriver_systemd_test.go @@ -6,8 +6,8 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" "gotest.tools/v3/skip" ) diff --git a/integration/system/disk_usage_test.go b/integration/system/disk_usage_test.go index a21424339f..fded082877 100644 --- a/integration/system/disk_usage_test.go +++ b/integration/system/disk_usage_test.go @@ -10,8 +10,8 @@ import ( "github.com/moby/moby/api/types/volume" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/system/event_test.go b/integration/system/event_test.go index f56ede83c1..a54a9168e6 100644 --- a/integration/system/event_test.go +++ b/integration/system/event_test.go @@ -15,7 +15,7 @@ import ( "github.com/moby/moby/api/types/volume" "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go index 9dc00eb8fb..fd4f4f204f 100644 --- a/integration/system/info_linux_test.go +++ b/integration/system/info_linux_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/system/info_test.go b/integration/system/info_test.go index 984c318770..65a81820f8 100644 --- a/integration/system/info_test.go +++ b/integration/system/info_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/moby/moby/api/types/registry" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/system/main_test.go b/integration/system/main_test.go index 11adde9050..4f74b95044 100644 --- a/integration/system/main_test.go +++ b/integration/system/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/system/ping_test.go b/integration/system/ping_test.go index 1629fe973a..d022915c60 100644 --- a/integration/system/ping_test.go +++ b/integration/system/ping_test.go @@ -9,9 +9,9 @@ import ( "github.com/moby/moby/api/types/build" "github.com/moby/moby/api/types/swarm" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/system/version_test.go b/integration/system/version_test.go index a29c135a0d..53abc9cb83 100644 --- a/integration/system/version_test.go +++ b/integration/system/version_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration/volume/main_test.go b/integration/volume/main_test.go index 0349063aa1..4f9912e8c0 100644 --- a/integration/volume/main_test.go +++ b/integration/volume/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" ) diff --git a/integration/volume/mount_test.go b/integration/volume/mount_test.go index 6e3b0f0690..a142f73575 100644 --- a/integration/volume/mount_test.go +++ b/integration/volume/mount_test.go @@ -17,7 +17,7 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/daemon/volume/safepath" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/volume/volume_test.go b/integration/volume/volume_test.go index 263da8b3dd..e00c66ba91 100644 --- a/integration/volume/volume_test.go +++ b/integration/volume/volume_test.go @@ -15,10 +15,10 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/v2/integration/internal/build" "github.com/moby/moby/v2/integration/internal/container" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/daemon" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/daemon" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/internal/test/suite/suite.go b/internal/test/suite/suite.go index cc0dab41a4..4ec9973281 100644 --- a/internal/test/suite/suite.go +++ b/internal/test/suite/suite.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" ) // TimeoutFlag is the flag to set a per-test timeout when running tests. Defaults to `-timeout`. diff --git a/testutil/daemon/config.go b/internal/testutil/daemon/config.go similarity index 100% rename from testutil/daemon/config.go rename to internal/testutil/daemon/config.go diff --git a/testutil/daemon/container.go b/internal/testutil/daemon/container.go similarity index 100% rename from testutil/daemon/container.go rename to internal/testutil/daemon/container.go diff --git a/testutil/daemon/daemon.go b/internal/testutil/daemon/daemon.go similarity index 99% rename from testutil/daemon/daemon.go rename to internal/testutil/daemon/daemon.go index 8a36bac999..2009c26ebe 100644 --- a/testutil/daemon/daemon.go +++ b/internal/testutil/daemon/daemon.go @@ -25,9 +25,9 @@ import ( "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/stringid" "github.com/moby/moby/v2/daemon/container" + "github.com/moby/moby/v2/internal/testutil/request" "github.com/moby/moby/v2/pkg/ioutils" "github.com/moby/moby/v2/pkg/tailfile" - "github.com/moby/moby/v2/testutil/request" "github.com/pkg/errors" "gotest.tools/v3/assert" "gotest.tools/v3/poll" diff --git a/testutil/daemon/daemon_freebsd.go b/internal/testutil/daemon/daemon_freebsd.go similarity index 100% rename from testutil/daemon/daemon_freebsd.go rename to internal/testutil/daemon/daemon_freebsd.go diff --git a/testutil/daemon/daemon_linux.go b/internal/testutil/daemon/daemon_linux.go similarity index 100% rename from testutil/daemon/daemon_linux.go rename to internal/testutil/daemon/daemon_linux.go diff --git a/testutil/daemon/daemon_unix.go b/internal/testutil/daemon/daemon_unix.go similarity index 100% rename from testutil/daemon/daemon_unix.go rename to internal/testutil/daemon/daemon_unix.go diff --git a/testutil/daemon/daemon_windows.go b/internal/testutil/daemon/daemon_windows.go similarity index 100% rename from testutil/daemon/daemon_windows.go rename to internal/testutil/daemon/daemon_windows.go diff --git a/testutil/daemon/doc.go b/internal/testutil/daemon/doc.go similarity index 100% rename from testutil/daemon/doc.go rename to internal/testutil/daemon/doc.go diff --git a/testutil/daemon/node.go b/internal/testutil/daemon/node.go similarity index 100% rename from testutil/daemon/node.go rename to internal/testutil/daemon/node.go diff --git a/testutil/daemon/ops.go b/internal/testutil/daemon/ops.go similarity index 98% rename from testutil/daemon/ops.go rename to internal/testutil/daemon/ops.go index 41fa1c85e9..54c6ed75a3 100644 --- a/testutil/daemon/ops.go +++ b/internal/testutil/daemon/ops.go @@ -3,7 +3,7 @@ package daemon import ( "os/user" - "github.com/moby/moby/v2/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/environment" ) // Option is used to configure a daemon. diff --git a/testutil/daemon/plugin.go b/internal/testutil/daemon/plugin.go similarity index 100% rename from testutil/daemon/plugin.go rename to internal/testutil/daemon/plugin.go diff --git a/testutil/daemon/secret.go b/internal/testutil/daemon/secret.go similarity index 100% rename from testutil/daemon/secret.go rename to internal/testutil/daemon/secret.go diff --git a/testutil/daemon/service.go b/internal/testutil/daemon/service.go similarity index 100% rename from testutil/daemon/service.go rename to internal/testutil/daemon/service.go diff --git a/testutil/daemon/swarm.go b/internal/testutil/daemon/swarm.go similarity index 100% rename from testutil/daemon/swarm.go rename to internal/testutil/daemon/swarm.go diff --git a/testutil/doc.go b/internal/testutil/doc.go similarity index 100% rename from testutil/doc.go rename to internal/testutil/doc.go diff --git a/testutil/environment/clean.go b/internal/testutil/environment/clean.go similarity index 100% rename from testutil/environment/clean.go rename to internal/testutil/environment/clean.go diff --git a/testutil/environment/environment.go b/internal/testutil/environment/environment.go similarity index 99% rename from testutil/environment/environment.go rename to internal/testutil/environment/environment.go index 9a30fab7f2..04808491bf 100644 --- a/testutil/environment/environment.go +++ b/internal/testutil/environment/environment.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/api/types/filters" "github.com/moby/moby/api/types/system" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil/fixtures/load" + "github.com/moby/moby/v2/internal/testutil/fixtures/load" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/testutil/environment/protect.go b/internal/testutil/environment/protect.go similarity index 99% rename from testutil/environment/protect.go rename to internal/testutil/environment/protect.go index 9df1e102f6..82cd9b8a23 100644 --- a/testutil/environment/protect.go +++ b/internal/testutil/environment/protect.go @@ -8,7 +8,7 @@ import ( "github.com/moby/moby/api/types/filters" "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" + "github.com/moby/moby/v2/internal/testutil" "go.opentelemetry.io/otel" "gotest.tools/v3/assert" ) diff --git a/testutil/environment/protect_linux.go b/internal/testutil/environment/protect_linux.go similarity index 100% rename from testutil/environment/protect_linux.go rename to internal/testutil/environment/protect_linux.go diff --git a/testutil/environment/protect_others.go b/internal/testutil/environment/protect_others.go similarity index 100% rename from testutil/environment/protect_others.go rename to internal/testutil/environment/protect_others.go diff --git a/testutil/fakecontext/context.go b/internal/testutil/fakecontext/context.go similarity index 100% rename from testutil/fakecontext/context.go rename to internal/testutil/fakecontext/context.go diff --git a/testutil/fakegit/fakegit.go b/internal/testutil/fakegit/fakegit.go similarity index 96% rename from testutil/fakegit/fakegit.go rename to internal/testutil/fakegit/fakegit.go index 84d5fe60e7..941098080d 100644 --- a/testutil/fakegit/fakegit.go +++ b/internal/testutil/fakegit/fakegit.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/fakestorage" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/fakestorage" ) type gitServer interface { diff --git a/testutil/fakestorage/fixtures.go b/internal/testutil/fakestorage/fixtures.go similarity index 100% rename from testutil/fakestorage/fixtures.go rename to internal/testutil/fakestorage/fixtures.go diff --git a/testutil/fakestorage/storage.go b/internal/testutil/fakestorage/storage.go similarity index 95% rename from testutil/fakestorage/storage.go rename to internal/testutil/fakestorage/storage.go index f8d5e3b3c7..fe6dc88b8d 100644 --- a/testutil/fakestorage/storage.go +++ b/internal/testutil/fakestorage/storage.go @@ -13,10 +13,10 @@ import ( containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/client" - "github.com/moby/moby/v2/testutil" - "github.com/moby/moby/v2/testutil/environment" - "github.com/moby/moby/v2/testutil/fakecontext" - "github.com/moby/moby/v2/testutil/request" + "github.com/moby/moby/v2/internal/testutil" + "github.com/moby/moby/v2/internal/testutil/environment" + "github.com/moby/moby/v2/internal/testutil/fakecontext" + "github.com/moby/moby/v2/internal/testutil/request" "gotest.tools/v3/assert" ) diff --git a/testutil/fixtures/load/frozen.go b/internal/testutil/fixtures/load/frozen.go similarity index 100% rename from testutil/fixtures/load/frozen.go rename to internal/testutil/fixtures/load/frozen.go diff --git a/testutil/fixtures/plugin/basic/basic.go b/internal/testutil/fixtures/plugin/basic/basic.go similarity index 100% rename from testutil/fixtures/plugin/basic/basic.go rename to internal/testutil/fixtures/plugin/basic/basic.go diff --git a/testutil/fixtures/plugin/plugin.go b/internal/testutil/fixtures/plugin/plugin.go similarity index 99% rename from testutil/fixtures/plugin/plugin.go rename to internal/testutil/fixtures/plugin/plugin.go index 93cc5003ec..6a3addf084 100644 --- a/testutil/fixtures/plugin/plugin.go +++ b/internal/testutil/fixtures/plugin/plugin.go @@ -224,7 +224,7 @@ func ensureBasicPluginBin() (string, error) { return "", err } installPath := filepath.Join(os.Getenv("GOPATH"), "bin", name) - sourcePath := filepath.Join("github.com", "docker", "docker", "testutil", "fixtures", "plugin", "basic") + sourcePath := filepath.Join("github.com", "docker", "docker", "internal", "testutil", "fixtures", "plugin", "basic") cmd := exec.Command(goBin, "build", "-o", installPath, sourcePath) cmd.Env = append(os.Environ(), "CGO_ENABLED=0", "GO111MODULE=off") if out, err := cmd.CombinedOutput(); err != nil { diff --git a/testutil/helper.go b/internal/testutil/helper.go similarity index 100% rename from testutil/helper.go rename to internal/testutil/helper.go diff --git a/testutil/helpers.go b/internal/testutil/helpers.go similarity index 100% rename from testutil/helpers.go rename to internal/testutil/helpers.go diff --git a/testutil/registry/ops.go b/internal/testutil/registry/ops.go similarity index 100% rename from testutil/registry/ops.go rename to internal/testutil/registry/ops.go diff --git a/testutil/registry/registry.go b/internal/testutil/registry/registry.go similarity index 100% rename from testutil/registry/registry.go rename to internal/testutil/registry/registry.go diff --git a/testutil/registry/registry_mock.go b/internal/testutil/registry/registry_mock.go similarity index 100% rename from testutil/registry/registry_mock.go rename to internal/testutil/registry/registry_mock.go diff --git a/testutil/request/npipe.go b/internal/testutil/request/npipe.go similarity index 100% rename from testutil/request/npipe.go rename to internal/testutil/request/npipe.go diff --git a/testutil/request/npipe_windows.go b/internal/testutil/request/npipe_windows.go similarity index 100% rename from testutil/request/npipe_windows.go rename to internal/testutil/request/npipe_windows.go diff --git a/testutil/request/ops.go b/internal/testutil/request/ops.go similarity index 100% rename from testutil/request/ops.go rename to internal/testutil/request/ops.go diff --git a/testutil/request/request.go b/internal/testutil/request/request.go similarity index 99% rename from testutil/request/request.go rename to internal/testutil/request/request.go index a2882f3631..d4af61eba8 100644 --- a/testutil/request/request.go +++ b/internal/testutil/request/request.go @@ -16,8 +16,8 @@ import ( "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" "github.com/moby/moby/client" + "github.com/moby/moby/v2/internal/testutil/environment" "github.com/moby/moby/v2/pkg/ioutils" - "github.com/moby/moby/v2/testutil/environment" "github.com/pkg/errors" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "gotest.tools/v3/assert" diff --git a/testutil/stringutils.go b/internal/testutil/stringutils.go similarity index 100% rename from testutil/stringutils.go rename to internal/testutil/stringutils.go diff --git a/testutil/stringutils_test.go b/internal/testutil/stringutils_test.go similarity index 100% rename from testutil/stringutils_test.go rename to internal/testutil/stringutils_test.go diff --git a/testutil/temp_files.go b/internal/testutil/temp_files.go similarity index 100% rename from testutil/temp_files.go rename to internal/testutil/temp_files.go