diff --git a/daemon/containerd/image_inspect_test.go b/daemon/containerd/image_inspect_test.go index cd058cdd5a..6a83121353 100644 --- a/daemon/containerd/image_inspect_test.go +++ b/daemon/containerd/image_inspect_test.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log/logtest" "github.com/moby/moby/v2/daemon/server/backend" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/containerd/image_list_test.go b/daemon/containerd/image_list_test.go index 5217cd3f11..da37ef4bd9 100644 --- a/daemon/containerd/image_list_test.go +++ b/daemon/containerd/image_list_test.go @@ -18,7 +18,7 @@ import ( imagetypes "github.com/moby/moby/api/types/image" "github.com/moby/moby/v2/daemon/container" "github.com/moby/moby/v2/daemon/server/imagebackend" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/daemon/containerd/image_load_test.go b/daemon/containerd/image_load_test.go index 2396f3c95f..ffcbdc6cd0 100644 --- a/daemon/containerd/image_load_test.go +++ b/daemon/containerd/image_load_test.go @@ -17,8 +17,8 @@ import ( "github.com/moby/go-archive" "github.com/moby/moby/v2/daemon/server/backend" "github.com/moby/moby/v2/daemon/server/imagebackend" - "github.com/moby/moby/v2/internal/testutils/labelstore" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/labelstore" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/containerd/image_push_test.go b/daemon/containerd/image_push_test.go index a9e0c05d29..b1411d54cf 100644 --- a/daemon/containerd/image_push_test.go +++ b/daemon/containerd/image_push_test.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/containerd/v2/pkg/namespaces" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/platforms" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/containerd/image_save_test.go b/daemon/containerd/image_save_test.go index 594d66a021..18ada0ed04 100644 --- a/daemon/containerd/image_save_test.go +++ b/daemon/containerd/image_save_test.go @@ -9,7 +9,7 @@ import ( "github.com/containerd/containerd/v2/pkg/namespaces" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/platforms" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/daemon_linux_test.go b/daemon/daemon_linux_test.go index 38892dba42..bef7e62a20 100644 --- a/daemon/daemon_linux_test.go +++ b/daemon/daemon_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" containertypes "github.com/moby/moby/api/types/container" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/moby/sys/mount" "github.com/moby/sys/mountinfo" "github.com/vishvananda/netlink" diff --git a/daemon/internal/distribution/manifest_test.go b/daemon/internal/distribution/manifest_test.go index f17c9ee5a6..09bc1cee9c 100644 --- a/daemon/internal/distribution/manifest_test.go +++ b/daemon/internal/distribution/manifest_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution/manifest/ocischema" "github.com/docker/distribution/manifest/schema2" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/moby/moby/v2/internal/testutils/labelstore" + "github.com/moby/moby/v2/internal/testutil/labelstore" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/daemon/libnetwork/drivers/bridge/bridge_linux_test.go b/daemon/libnetwork/drivers/bridge/bridge_linux_test.go index 07a91817c2..48abc712f4 100644 --- a/daemon/libnetwork/drivers/bridge/bridge_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/bridge_linux_test.go @@ -28,8 +28,8 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/portallocator" "github.com/moby/moby/v2/daemon/libnetwork/portmapperapi" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" "gotest.tools/v3/assert" diff --git a/daemon/libnetwork/drivers/bridge/interface_linux_test.go b/daemon/libnetwork/drivers/bridge/interface_linux_test.go index c4daf48ab5..4ef8240dfa 100644 --- a/daemon/libnetwork/drivers/bridge/interface_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/interface_linux_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" "gotest.tools/v3/assert" diff --git a/daemon/libnetwork/drivers/bridge/internal/iptabler/iptabler_test.go b/daemon/libnetwork/drivers/bridge/internal/iptabler/iptabler_test.go index 4d5cb5580b..30c826f3b3 100644 --- a/daemon/libnetwork/drivers/bridge/internal/iptabler/iptabler_test.go +++ b/daemon/libnetwork/drivers/bridge/internal/iptabler/iptabler_test.go @@ -14,7 +14,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller" "github.com/moby/moby/v2/daemon/libnetwork/iptables" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" "gotest.tools/v3/golden" "gotest.tools/v3/icmd" diff --git a/daemon/libnetwork/drivers/bridge/internal/iptabler/network_test.go b/daemon/libnetwork/drivers/bridge/internal/iptabler/network_test.go index 626be20538..f578da8171 100644 --- a/daemon/libnetwork/drivers/bridge/internal/iptabler/network_test.go +++ b/daemon/libnetwork/drivers/bridge/internal/iptabler/network_test.go @@ -9,7 +9,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller" "github.com/moby/moby/v2/daemon/libnetwork/iptables" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/libnetwork/drivers/bridge/internal/nftabler/nftabler_test.go b/daemon/libnetwork/drivers/bridge/internal/nftabler/nftabler_test.go index f5a8520f37..af96a853d5 100644 --- a/daemon/libnetwork/drivers/bridge/internal/nftabler/nftabler_test.go +++ b/daemon/libnetwork/drivers/bridge/internal/nftabler/nftabler_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller" "github.com/moby/moby/v2/daemon/libnetwork/internal/nftables" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/daemon/libnetwork/drivers/bridge/network_linux_test.go b/daemon/libnetwork/drivers/bridge/network_linux_test.go index 2b3049f75f..57ca24c05c 100644 --- a/daemon/libnetwork/drivers/bridge/network_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/network_linux_test.go @@ -8,8 +8,8 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drvregistry" "github.com/moby/moby/v2/daemon/libnetwork/netlabel" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go index e8b4d7bd35..0422445f8b 100644 --- a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go @@ -24,8 +24,8 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/portmappers/nat" "github.com/moby/moby/v2/daemon/libnetwork/portmappers/routed" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" diff --git a/daemon/libnetwork/drivers/bridge/setup_device_linux_test.go b/daemon/libnetwork/drivers/bridge/setup_device_linux_test.go index 7c6719a908..b38cc8159c 100644 --- a/daemon/libnetwork/drivers/bridge/setup_device_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/setup_device_linux_test.go @@ -9,7 +9,7 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/moby/moby/v2/daemon/libnetwork/netutils" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/libnetwork/drivers/bridge/setup_ip_forwarding_test.go b/daemon/libnetwork/drivers/bridge/setup_ip_forwarding_test.go index 7567c169de..965fc9e5d0 100644 --- a/daemon/libnetwork/drivers/bridge/setup_ip_forwarding_test.go +++ b/daemon/libnetwork/drivers/bridge/setup_ip_forwarding_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/libnetwork/drivers/bridge/setup_ipv4_linux_test.go b/daemon/libnetwork/drivers/bridge/setup_ipv4_linux_test.go index 446b5d2649..79ca05d98f 100644 --- a/daemon/libnetwork/drivers/bridge/setup_ipv4_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/setup_ipv4_linux_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" ) diff --git a/daemon/libnetwork/drivers/bridge/setup_ipv6_linux_test.go b/daemon/libnetwork/drivers/bridge/setup_ipv6_linux_test.go index 42acf8289d..00b711fed2 100644 --- a/daemon/libnetwork/drivers/bridge/setup_ipv6_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/setup_ipv6_linux_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" ) diff --git a/daemon/libnetwork/drivers/bridge/setup_verify_linux_test.go b/daemon/libnetwork/drivers/bridge/setup_verify_linux_test.go index 2baccd16b5..0504ae87c4 100644 --- a/daemon/libnetwork/drivers/bridge/setup_verify_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/setup_verify_linux_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" ) diff --git a/daemon/libnetwork/drivers/bridge/wsl2_linux_test.go b/daemon/libnetwork/drivers/bridge/wsl2_linux_test.go index f8cdd79de3..2494d1d054 100644 --- a/daemon/libnetwork/drivers/bridge/wsl2_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/wsl2_linux_test.go @@ -8,8 +8,7 @@ import ( "path/filepath" "testing" - "github.com/moby/moby/v2/internal/testutils/netnsutils" - + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/libnetwork/drivers/ipvlan/ipvlan_test.go b/daemon/libnetwork/drivers/ipvlan/ipvlan_test.go index c5bddc13ad..3a2185d510 100644 --- a/daemon/libnetwork/drivers/ipvlan/ipvlan_test.go +++ b/daemon/libnetwork/drivers/ipvlan/ipvlan_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/driverapi" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" ) const testNetworkType = "ipvlan" diff --git a/daemon/libnetwork/drivers/macvlan/macvlan_test.go b/daemon/libnetwork/drivers/macvlan/macvlan_test.go index c699319f21..e5bfcd1af0 100644 --- a/daemon/libnetwork/drivers/macvlan/macvlan_test.go +++ b/daemon/libnetwork/drivers/macvlan/macvlan_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/driverapi" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" ) const testNetworkType = "macvlan" diff --git a/daemon/libnetwork/drivers/windows/windows_test.go b/daemon/libnetwork/drivers/windows/windows_test.go index b4816971a8..0c94d0ec78 100644 --- a/daemon/libnetwork/drivers/windows/windows_test.go +++ b/daemon/libnetwork/drivers/windows/windows_test.go @@ -10,7 +10,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/driverapi" "github.com/moby/moby/v2/daemon/libnetwork/netlabel" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/storeutils" + "github.com/moby/moby/v2/internal/testutil/storeutils" "gotest.tools/v3/assert" ) diff --git a/daemon/libnetwork/endpoint_unix_test.go b/daemon/libnetwork/endpoint_unix_test.go index ca5bcfec61..1b4a8ff577 100644 --- a/daemon/libnetwork/endpoint_unix_test.go +++ b/daemon/libnetwork/endpoint_unix_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/ipams/defaultipam" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" ) func TestHostsEntries(t *testing.T) { diff --git a/daemon/libnetwork/firewall_linux_test.go b/daemon/libnetwork/firewall_linux_test.go index caae86a119..2e204f4523 100644 --- a/daemon/libnetwork/firewall_linux_test.go +++ b/daemon/libnetwork/firewall_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge" "github.com/moby/moby/v2/daemon/libnetwork/internal/nftables" "github.com/moby/moby/v2/daemon/libnetwork/iptables" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/daemon/libnetwork/internal/nftables/nftables_linux_test.go b/daemon/libnetwork/internal/nftables/nftables_linux_test.go index c8527886dc..6949ad342b 100644 --- a/daemon/libnetwork/internal/nftables/nftables_linux_test.go +++ b/daemon/libnetwork/internal/nftables/nftables_linux_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/golden" diff --git a/daemon/libnetwork/iptables/iptables_test.go b/daemon/libnetwork/iptables/iptables_test.go index b06bc0cacd..b814b18961 100644 --- a/daemon/libnetwork/iptables/iptables_test.go +++ b/daemon/libnetwork/iptables/iptables_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "golang.org/x/sync/errgroup" "gotest.tools/v3/assert" "gotest.tools/v3/skip" @@ -327,8 +327,10 @@ func TestFlushChain(t *testing.T) { assert.NilError(t, err) // Add a rule to the chain - rule := Rule{IPVer: IPv4, Table: table, Chain: chain, - Args: []string{"-j", "ACCEPT"}} + rule := Rule{ + IPVer: IPv4, Table: table, Chain: chain, + Args: []string{"-j", "ACCEPT"}, + } assert.NilError(t, rule.Insert()) // Flush the chain diff --git a/daemon/libnetwork/libnetwork_internal_test.go b/daemon/libnetwork/libnetwork_internal_test.go index 98e11d3a07..db837fba2c 100644 --- a/daemon/libnetwork/libnetwork_internal_test.go +++ b/daemon/libnetwork/libnetwork_internal_test.go @@ -22,7 +22,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/netutils" "github.com/moby/moby/v2/daemon/libnetwork/scope" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/daemon/libnetwork/libnetwork_linux_test.go b/daemon/libnetwork/libnetwork_linux_test.go index ba476ab92e..4e0493175d 100644 --- a/daemon/libnetwork/libnetwork_linux_test.go +++ b/daemon/libnetwork/libnetwork_linux_test.go @@ -29,7 +29,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/options" "github.com/moby/moby/v2/daemon/libnetwork/osl" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/moby/moby/v2/pkg/plugins" "github.com/moby/sys/reexec" "github.com/pkg/errors" diff --git a/daemon/libnetwork/netutils/utils_linux_test.go b/daemon/libnetwork/netutils/utils_linux_test.go index 9e4a848e43..06ce7748f8 100644 --- a/daemon/libnetwork/netutils/utils_linux_test.go +++ b/daemon/libnetwork/netutils/utils_linux_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/libnetwork/osl/sandbox_linux_test.go b/daemon/libnetwork/osl/sandbox_linux_test.go index e608bf76ab..4252f092c6 100644 --- a/daemon/libnetwork/osl/sandbox_linux_test.go +++ b/daemon/libnetwork/osl/sandbox_linux_test.go @@ -15,7 +15,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/nlwrap" "github.com/moby/moby/v2/daemon/libnetwork/ns" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/vishvananda/netlink" "github.com/vishvananda/netlink/nl" "github.com/vishvananda/netns" diff --git a/daemon/libnetwork/resolver_test.go b/daemon/libnetwork/resolver_test.go index a9a6bba3b7..c31b73075b 100644 --- a/daemon/libnetwork/resolver_test.go +++ b/daemon/libnetwork/resolver_test.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/log" "github.com/miekg/dns" "github.com/moby/moby/v2/daemon/libnetwork/types" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "github.com/sirupsen/logrus" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/libnetwork/resolver_unix_test.go b/daemon/libnetwork/resolver_unix_test.go index 59ad693e64..37094d7e13 100644 --- a/daemon/libnetwork/resolver_unix_test.go +++ b/daemon/libnetwork/resolver_unix_test.go @@ -10,7 +10,7 @@ import ( "github.com/miekg/dns" "github.com/moby/moby/v2/daemon/libnetwork/config" "github.com/moby/moby/v2/daemon/libnetwork/ipamutils" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" ) // test only works on linux diff --git a/daemon/libnetwork/sandbox_unix_test.go b/daemon/libnetwork/sandbox_unix_test.go index b05f620348..5ad7923234 100644 --- a/daemon/libnetwork/sandbox_unix_test.go +++ b/daemon/libnetwork/sandbox_unix_test.go @@ -14,7 +14,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/ipamutils" "github.com/moby/moby/v2/daemon/libnetwork/netlabel" "github.com/moby/moby/v2/daemon/libnetwork/options" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/daemon/libnetwork/service_common_unix_test.go b/daemon/libnetwork/service_common_unix_test.go index 6baba83b95..8c1c4585d1 100644 --- a/daemon/libnetwork/service_common_unix_test.go +++ b/daemon/libnetwork/service_common_unix_test.go @@ -9,7 +9,7 @@ import ( "github.com/moby/moby/v2/daemon/libnetwork/config" "github.com/moby/moby/v2/daemon/libnetwork/ipamutils" - "github.com/moby/moby/v2/internal/testutils/netnsutils" + "github.com/moby/moby/v2/internal/testutil/netnsutils" "gotest.tools/v3/assert" ) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 02f1bddf9a..8200099deb 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/v2/integration-cli/cli" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index bbf5f06fff..1bd78320f7 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -32,7 +32,7 @@ import ( "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/internal/testutil/specialimage" "github.com/moby/sys/mountinfo" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 31dcd04cd5..05be37ace7 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -13,7 +13,7 @@ import ( "github.com/moby/moby/api/types/image" "github.com/moby/moby/v2/integration-cli/cli" "github.com/moby/moby/v2/integration-cli/cli/build" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 77aec00255..9a43d62f99 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -21,7 +21,7 @@ import ( "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/internal/testutil/specialimage" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration/image/inspect_test.go b/integration/image/inspect_test.go index 35836fd625..31dc8dc1a5 100644 --- a/integration/image/inspect_test.go +++ b/integration/image/inspect_test.go @@ -7,7 +7,7 @@ import ( "github.com/moby/moby/client" iimage "github.com/moby/moby/v2/integration/internal/image" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/list_test.go b/integration/image/list_test.go index f2f81db22a..9f38523e4d 100644 --- a/integration/image/list_test.go +++ b/integration/image/list_test.go @@ -17,7 +17,7 @@ import ( 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/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/load_test.go b/integration/image/load_test.go index c9a81bd328..eebf71be90 100644 --- a/integration/image/load_test.go +++ b/integration/image/load_test.go @@ -8,7 +8,7 @@ import ( "github.com/moby/moby/api/types/image" "github.com/moby/moby/client" iimage "github.com/moby/moby/v2/integration/internal/image" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/prune_test.go b/integration/image/prune_test.go index ff00a0da56..8c19610f8f 100644 --- a/integration/image/prune_test.go +++ b/integration/image/prune_test.go @@ -11,7 +11,7 @@ import ( 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/internal/testutil/specialimage" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" diff --git a/integration/image/remove_test.go b/integration/image/remove_test.go index c8af083a61..ceb147d10d 100644 --- a/integration/image/remove_test.go +++ b/integration/image/remove_test.go @@ -11,7 +11,7 @@ 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/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/integration/image/save_test.go b/integration/image/save_test.go index cafb8a1fa9..7bb882668d 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" "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/internal/testutil/specialimage" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" @@ -174,7 +174,7 @@ func TestSaveOCI(t *testing.T) { f, err := tarfs.Open(layerPath) assert.NilError(t, err) - layerDigest, err := testutils.UncompressedTarDigest(f) + layerDigest, err := testutil.UncompressedTarDigest(f) f.Close() assert.NilError(t, err) diff --git a/integration/internal/image/load.go b/integration/internal/image/load.go index 17df0a8605..2533ac9624 100644 --- a/integration/internal/image/load.go +++ b/integration/internal/image/load.go @@ -12,7 +12,7 @@ import ( "github.com/moby/go-archive" "github.com/moby/moby/client" "github.com/moby/moby/client/pkg/jsonmessage" - "github.com/moby/moby/v2/internal/testutils/specialimage" + "github.com/moby/moby/v2/internal/testutil/specialimage" "gotest.tools/v3/assert" ) diff --git a/internal/testutils/archive.go b/internal/testutil/archive.go similarity index 96% rename from internal/testutils/archive.go rename to internal/testutil/archive.go index 50e66372a3..4891e06596 100644 --- a/internal/testutils/archive.go +++ b/internal/testutil/archive.go @@ -1,4 +1,4 @@ -package testutils +package testutil import ( "io" diff --git a/internal/testutils/labelstore/memory_label_store.go b/internal/testutil/labelstore/memory_label_store.go similarity index 100% rename from internal/testutils/labelstore/memory_label_store.go rename to internal/testutil/labelstore/memory_label_store.go diff --git a/internal/testutils/logger.go b/internal/testutil/logger.go similarity index 90% rename from internal/testutils/logger.go rename to internal/testutil/logger.go index 3207495421..c50deb06fb 100644 --- a/internal/testutils/logger.go +++ b/internal/testutil/logger.go @@ -1,4 +1,4 @@ -package testutils +package testutil import "testing" diff --git a/internal/testutils/netnsutils/context_unix.go b/internal/testutil/netnsutils/context_unix.go similarity index 97% rename from internal/testutils/netnsutils/context_unix.go rename to internal/testutil/netnsutils/context_unix.go index 8358eb744e..8acc1294da 100644 --- a/internal/testutils/netnsutils/context_unix.go +++ b/internal/testutil/netnsutils/context_unix.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/moby/moby/v2/daemon/libnetwork/ns" - "github.com/moby/moby/v2/internal/testutils" + "github.com/moby/moby/v2/internal/testutil" "github.com/pkg/errors" "github.com/vishvananda/netns" "golang.org/x/sys/unix" @@ -143,7 +143,7 @@ func (c *OSContext) restore(t *testing.T) { // t.Fatalf("%+v", err) // } // } -func (c *OSContext) Set() (func(testutils.Logger), error) { +func (c *OSContext) Set() (func(testutil.Logger), error) { runtime.LockOSThread() orig, err := netns.Get() if err != nil { @@ -158,7 +158,7 @@ func (c *OSContext) Set() (func(testutils.Logger), error) { tid := unix.Gettid() _, file, line, callerOK := runtime.Caller(0) - return func(log testutils.Logger) { + return func(log testutil.Logger) { if unix.Gettid() != tid { msg := "teardown function must be called from the same goroutine as c.Set()" if callerOK { diff --git a/internal/testutils/netnsutils/context_windows.go b/internal/testutil/netnsutils/context_windows.go similarity index 100% rename from internal/testutils/netnsutils/context_windows.go rename to internal/testutil/netnsutils/context_windows.go diff --git a/internal/testutils/netnsutils/sanity_linux.go b/internal/testutil/netnsutils/sanity_linux.go similarity index 100% rename from internal/testutils/netnsutils/sanity_linux.go rename to internal/testutil/netnsutils/sanity_linux.go diff --git a/internal/testutils/netnsutils/sanity_notlinux.go b/internal/testutil/netnsutils/sanity_notlinux.go similarity index 100% rename from internal/testutils/netnsutils/sanity_notlinux.go rename to internal/testutil/netnsutils/sanity_notlinux.go diff --git a/internal/testutils/specialimage/configtarget.go b/internal/testutil/specialimage/configtarget.go similarity index 100% rename from internal/testutils/specialimage/configtarget.go rename to internal/testutil/specialimage/configtarget.go diff --git a/internal/testutils/specialimage/dangling.go b/internal/testutil/specialimage/dangling.go similarity index 100% rename from internal/testutils/specialimage/dangling.go rename to internal/testutil/specialimage/dangling.go diff --git a/internal/testutils/specialimage/emptyfs.go b/internal/testutil/specialimage/emptyfs.go similarity index 100% rename from internal/testutils/specialimage/emptyfs.go rename to internal/testutil/specialimage/emptyfs.go diff --git a/internal/testutils/specialimage/emptyindex.go b/internal/testutil/specialimage/emptyindex.go similarity index 100% rename from internal/testutils/specialimage/emptyindex.go rename to internal/testutil/specialimage/emptyindex.go diff --git a/internal/testutils/specialimage/load.go b/internal/testutil/specialimage/load.go similarity index 100% rename from internal/testutils/specialimage/load.go rename to internal/testutil/specialimage/load.go diff --git a/internal/testutils/specialimage/multilayer.go b/internal/testutil/specialimage/multilayer.go similarity index 100% rename from internal/testutils/specialimage/multilayer.go rename to internal/testutil/specialimage/multilayer.go diff --git a/internal/testutils/specialimage/multiplatform.go b/internal/testutil/specialimage/multiplatform.go similarity index 100% rename from internal/testutils/specialimage/multiplatform.go rename to internal/testutil/specialimage/multiplatform.go diff --git a/internal/testutils/specialimage/partial.go b/internal/testutil/specialimage/partial.go similarity index 100% rename from internal/testutils/specialimage/partial.go rename to internal/testutil/specialimage/partial.go diff --git a/internal/testutils/specialimage/random.go b/internal/testutil/specialimage/random.go similarity index 100% rename from internal/testutils/specialimage/random.go rename to internal/testutil/specialimage/random.go diff --git a/internal/testutils/specialimage/textplain.go b/internal/testutil/specialimage/textplain.go similarity index 100% rename from internal/testutils/specialimage/textplain.go rename to internal/testutil/specialimage/textplain.go diff --git a/internal/testutils/specialimage/twoplatform.go b/internal/testutil/specialimage/twoplatform.go similarity index 100% rename from internal/testutils/specialimage/twoplatform.go rename to internal/testutil/specialimage/twoplatform.go diff --git a/internal/testutils/storeutils/store.go b/internal/testutil/storeutils/store.go similarity index 100% rename from internal/testutils/storeutils/store.go rename to internal/testutil/storeutils/store.go