diff --git a/cmd/docker-proxy/network_proxy_test.go b/cmd/docker-proxy/network_proxy_test.go index ec2ab77ccd..7b408d6ad0 100644 --- a/cmd/docker-proxy/network_proxy_test.go +++ b/cmd/docker-proxy/network_proxy_test.go @@ -13,9 +13,6 @@ import ( "github.com/ishidawataru/sctp" "gotest.tools/v3/skip" - - // this takes care of the incontainer flag - _ "github.com/docker/docker/libnetwork/testutils" ) var testBuf = []byte("Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo") diff --git a/libnetwork/bitseq/sequence_test.go b/libnetwork/bitseq/sequence_test.go index af9d61c6d4..c358cd1930 100644 --- a/libnetwork/bitseq/sequence_test.go +++ b/libnetwork/bitseq/sequence_test.go @@ -10,7 +10,6 @@ import ( "time" "github.com/docker/docker/libnetwork/datastore" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/libkv/store" "github.com/docker/libkv/store/boltdb" ) diff --git a/libnetwork/config/config_test.go b/libnetwork/config/config_test.go index e37f89bcfd..146880fae3 100644 --- a/libnetwork/config/config_test.go +++ b/libnetwork/config/config_test.go @@ -8,7 +8,6 @@ import ( "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/netlabel" - _ "github.com/docker/docker/libnetwork/testutils" ) func TestInvalidConfig(t *testing.T) { diff --git a/libnetwork/datastore/datastore_test.go b/libnetwork/datastore/datastore_test.go index 4827972906..534940a12a 100644 --- a/libnetwork/datastore/datastore_test.go +++ b/libnetwork/datastore/datastore_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/docker/docker/libnetwork/options" - _ "github.com/docker/docker/libnetwork/testutils" "gotest.tools/v3/assert" ) diff --git a/libnetwork/driverapi/driverapi_test.go b/libnetwork/driverapi/driverapi_test.go index cf72fb7e0c..e26da27e14 100644 --- a/libnetwork/driverapi/driverapi_test.go +++ b/libnetwork/driverapi/driverapi_test.go @@ -5,7 +5,6 @@ import ( "net" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/host/host_test.go b/libnetwork/drivers/host/host_test.go index ac3f556c4c..caa77df7c5 100644 --- a/libnetwork/drivers/host/host_test.go +++ b/libnetwork/drivers/host/host_test.go @@ -3,7 +3,6 @@ package host import ( "testing" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/ipvlan/ipvlan_test.go b/libnetwork/drivers/ipvlan/ipvlan_test.go index f531fdfb21..9514c9fa6c 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_test.go +++ b/libnetwork/drivers/ipvlan/ipvlan_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/docker/docker/libnetwork/driverapi" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/pkg/plugingetter" ) diff --git a/libnetwork/drivers/macvlan/macvlan_test.go b/libnetwork/drivers/macvlan/macvlan_test.go index 310e2d6294..12720d1ee6 100644 --- a/libnetwork/drivers/macvlan/macvlan_test.go +++ b/libnetwork/drivers/macvlan/macvlan_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/docker/docker/libnetwork/driverapi" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/pkg/plugingetter" ) diff --git a/libnetwork/drivers/null/null_test.go b/libnetwork/drivers/null/null_test.go index c9791b14f7..1c76d3760b 100644 --- a/libnetwork/drivers/null/null_test.go +++ b/libnetwork/drivers/null/null_test.go @@ -3,7 +3,6 @@ package null import ( "testing" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/overlay/overlay_test.go b/libnetwork/drivers/overlay/overlay_test.go index 70facb6d12..2280d16504 100644 --- a/libnetwork/drivers/overlay/overlay_test.go +++ b/libnetwork/drivers/overlay/overlay_test.go @@ -17,7 +17,6 @@ import ( "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libkv/store/consul" "github.com/vishvananda/netlink/nl" diff --git a/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go b/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go index 88091adfa5..319387345f 100644 --- a/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go +++ b/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go @@ -9,7 +9,6 @@ import ( "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/idm" "github.com/docker/docker/libnetwork/netlabel" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/libnetwork/drivers/overlay/peerdb_test.go b/libnetwork/drivers/overlay/peerdb_test.go index 930e6446c2..5c3a444345 100644 --- a/libnetwork/drivers/overlay/peerdb_test.go +++ b/libnetwork/drivers/overlay/peerdb_test.go @@ -5,8 +5,6 @@ package overlay import ( "net" "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) func TestPeerMarshal(t *testing.T) { diff --git a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remote/driver_test.go index dc098f98e9..149d752036 100644 --- a/libnetwork/drivers/remote/driver_test.go +++ b/libnetwork/drivers/remote/driver_test.go @@ -18,7 +18,6 @@ import ( "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" "github.com/docker/docker/pkg/plugins" ) diff --git a/libnetwork/drvregistry/drvregistry_test.go b/libnetwork/drvregistry/drvregistry_test.go index 3917e98a9c..ead157ef5e 100644 --- a/libnetwork/drvregistry/drvregistry_test.go +++ b/libnetwork/drvregistry/drvregistry_test.go @@ -14,9 +14,6 @@ import ( remoteIpam "github.com/docker/docker/libnetwork/ipams/remote" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" - - // this takes care of the incontainer flag - _ "github.com/docker/docker/libnetwork/testutils" ) const mockDriverName = "mock-driver" diff --git a/libnetwork/etchosts/etchosts_test.go b/libnetwork/etchosts/etchosts_test.go index f6023b6ab6..626e4f3f4d 100644 --- a/libnetwork/etchosts/etchosts_test.go +++ b/libnetwork/etchosts/etchosts_test.go @@ -7,7 +7,6 @@ import ( "os" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "golang.org/x/sync/errgroup" ) diff --git a/libnetwork/hostdiscovery/hostdiscovery_test.go b/libnetwork/hostdiscovery/hostdiscovery_test.go index 8b4a16afd7..2a6b0e4584 100644 --- a/libnetwork/hostdiscovery/hostdiscovery_test.go +++ b/libnetwork/hostdiscovery/hostdiscovery_test.go @@ -5,7 +5,6 @@ import ( "testing" mapset "github.com/deckarep/golang-set" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/pkg/discovery" ) diff --git a/libnetwork/idm/idm_test.go b/libnetwork/idm/idm_test.go index 4d1b2e70b1..54055787ba 100644 --- a/libnetwork/idm/idm_test.go +++ b/libnetwork/idm/idm_test.go @@ -2,8 +2,6 @@ package idm import ( "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) func TestNew(t *testing.T) { diff --git a/libnetwork/internal/caller/caller_test.go b/libnetwork/internal/caller/caller_test.go index 5eab2135a0..684cf5c1a1 100644 --- a/libnetwork/internal/caller/caller_test.go +++ b/libnetwork/internal/caller/caller_test.go @@ -2,8 +2,6 @@ package caller import ( "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) func fun1() string { diff --git a/libnetwork/internal/setmatrix/setmatrix_test.go b/libnetwork/internal/setmatrix/setmatrix_test.go index 3916064af6..058a0f07cf 100644 --- a/libnetwork/internal/setmatrix/setmatrix_test.go +++ b/libnetwork/internal/setmatrix/setmatrix_test.go @@ -6,8 +6,6 @@ import ( "strings" "testing" "time" - - _ "github.com/docker/docker/libnetwork/testutils" ) func TestSetSerialInsertDelete(t *testing.T) { diff --git a/libnetwork/ipam/allocator_test.go b/libnetwork/ipam/allocator_test.go index ef01a8c0c1..24ee77aeae 100644 --- a/libnetwork/ipam/allocator_test.go +++ b/libnetwork/ipam/allocator_test.go @@ -17,7 +17,6 @@ import ( "github.com/docker/docker/libnetwork/bitseq" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/ipamapi" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" "github.com/docker/libkv/store" "github.com/docker/libkv/store/boltdb" diff --git a/libnetwork/ipams/null/null_test.go b/libnetwork/ipams/null/null_test.go index 4339a137ce..d66e00853e 100644 --- a/libnetwork/ipams/null/null_test.go +++ b/libnetwork/ipams/null/null_test.go @@ -3,7 +3,6 @@ package null import ( "testing" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/remote_test.go index d99c7030b3..23b7837eac 100644 --- a/libnetwork/ipams/remote/remote_test.go +++ b/libnetwork/ipams/remote/remote_test.go @@ -14,7 +14,6 @@ import ( "testing" "github.com/docker/docker/libnetwork/ipamapi" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/pkg/plugins" ) diff --git a/libnetwork/ipams/windowsipam/windowsipam_test.go b/libnetwork/ipams/windowsipam/windowsipam_test.go index 245a54aa2a..f09cdbd943 100644 --- a/libnetwork/ipams/windowsipam/windowsipam_test.go +++ b/libnetwork/ipams/windowsipam/windowsipam_test.go @@ -6,7 +6,6 @@ import ( "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/netlabel" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/ipamutils/utils_test.go b/libnetwork/ipamutils/utils_test.go index f9b0622c9f..658e5f2cdb 100644 --- a/libnetwork/ipamutils/utils_test.go +++ b/libnetwork/ipamutils/utils_test.go @@ -4,7 +4,6 @@ import ( "net" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/libnetwork/iptables/iptables_test.go b/libnetwork/iptables/iptables_test.go index b2755ca2a1..fe732ff4cb 100644 --- a/libnetwork/iptables/iptables_test.go +++ b/libnetwork/iptables/iptables_test.go @@ -9,7 +9,6 @@ import ( "strings" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "golang.org/x/sync/errgroup" ) diff --git a/libnetwork/netlabel/labels_test.go b/libnetwork/netlabel/labels_test.go index cf9689b4ce..01a660bc73 100644 --- a/libnetwork/netlabel/labels_test.go +++ b/libnetwork/netlabel/labels_test.go @@ -2,8 +2,6 @@ package netlabel import ( "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) var input = []struct { diff --git a/libnetwork/networkdb/networkdb_test.go b/libnetwork/networkdb/networkdb_test.go index 30c775389e..b696411927 100644 --- a/libnetwork/networkdb/networkdb_test.go +++ b/libnetwork/networkdb/networkdb_test.go @@ -18,9 +18,6 @@ import ( "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" - - // this takes care of the incontainer flag - _ "github.com/docker/docker/libnetwork/testutils" ) var dbPort int32 = 10000 diff --git a/libnetwork/options/options_test.go b/libnetwork/options/options_test.go index cd3f7361bf..bff0c023e9 100644 --- a/libnetwork/options/options_test.go +++ b/libnetwork/options/options_test.go @@ -4,8 +4,6 @@ import ( "reflect" "strings" "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) func TestGenerate(t *testing.T) { diff --git a/libnetwork/osl/kernel/knobs_linux_test.go b/libnetwork/osl/kernel/knobs_linux_test.go index be949d37ec..b6b5d856f8 100644 --- a/libnetwork/osl/kernel/knobs_linux_test.go +++ b/libnetwork/osl/kernel/knobs_linux_test.go @@ -6,8 +6,6 @@ import ( "github.com/sirupsen/logrus" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" - - _ "github.com/docker/docker/libnetwork/testutils" ) func TestReadWriteKnobs(t *testing.T) { diff --git a/libnetwork/portallocator/portallocator_test.go b/libnetwork/portallocator/portallocator_test.go index 5484db6d68..8a34c3cbbb 100644 --- a/libnetwork/portallocator/portallocator_test.go +++ b/libnetwork/portallocator/portallocator_test.go @@ -4,8 +4,6 @@ import ( "fmt" "net" "testing" - - _ "github.com/docker/docker/libnetwork/testutils" ) func resetPortAllocator() { diff --git a/libnetwork/portmapper/mapper_linux_test.go b/libnetwork/portmapper/mapper_linux_test.go index 3795f58d21..b39376749f 100644 --- a/libnetwork/portmapper/mapper_linux_test.go +++ b/libnetwork/portmapper/mapper_linux_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/docker/docker/libnetwork/iptables" - _ "github.com/docker/docker/libnetwork/testutils" ) func init() { diff --git a/libnetwork/resolvconf/resolvconf_linux_test.go b/libnetwork/resolvconf/resolvconf_linux_test.go index fb76ff7cfa..26d33ef50c 100644 --- a/libnetwork/resolvconf/resolvconf_linux_test.go +++ b/libnetwork/resolvconf/resolvconf_linux_test.go @@ -6,7 +6,6 @@ import ( "os" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "github.com/docker/docker/libnetwork/types" "github.com/docker/docker/pkg/ioutils" ) diff --git a/libnetwork/types/types_test.go b/libnetwork/types/types_test.go index 1de6a30792..df97c57ca4 100644 --- a/libnetwork/types/types_test.go +++ b/libnetwork/types/types_test.go @@ -4,7 +4,6 @@ import ( "net" "testing" - _ "github.com/docker/docker/libnetwork/testutils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" )