Merge pull request #42756 from thaJeztah/remove_unused_testutils_imports

libnetwork: remove unused "testutils" imports

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")

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"
 )

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) {

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"
 )
 

libnetwork/driverapi/driverapi_test.go

@@ -5,7 +5,6 @@ import (
 	"net"
 	"testing"
 
-	_ "github.com/docker/docker/libnetwork/testutils"
 	"github.com/docker/docker/libnetwork/types"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"

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"

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) {

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"
 )

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"

libnetwork/etchosts/etchosts_test.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"testing"
 
-	_ "github.com/docker/docker/libnetwork/testutils"
 	"golang.org/x/sync/errgroup"
 )
 

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"
 )

libnetwork/idm/idm_test.go

@@ -2,8 +2,6 @@ package idm
 
 import (
 	"testing"
-
-	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func TestNew(t *testing.T) {

libnetwork/internal/caller/caller_test.go

@@ -2,8 +2,6 @@ package caller
 
 import (
 	"testing"
-
-	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func fun1() string {

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) {

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

libnetwork/iptables/iptables_test.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	_ "github.com/docker/docker/libnetwork/testutils"
 	"golang.org/x/sync/errgroup"
 )
 

libnetwork/netlabel/labels_test.go

@@ -2,8 +2,6 @@ package netlabel
 
 import (
 	"testing"
-
-	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 var input = []struct {

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

libnetwork/options/options_test.go

@@ -4,8 +4,6 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-
-	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func TestGenerate(t *testing.T) {

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) {

libnetwork/portallocator/portallocator_test.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"net"
 	"testing"
-
-	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func resetPortAllocator() {

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() {

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"
 )

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"
 )