libnetwork: remove unused "testutils" imports

Perhaps the testutils package in the past had an `init()` function to set up
specific things, but it no longer has. so these imports were doing nothing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-08-18 14:17:21 +02:00
parent ba2adeebdb
commit 427ad30c05
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
33 changed files with 0 additions and 47 deletions

View File

@ -13,9 +13,6 @@ import (
"github.com/ishidawataru/sctp" "github.com/ishidawataru/sctp"
"gotest.tools/v3/skip" "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") var testBuf = []byte("Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo")

View File

@ -10,7 +10,6 @@ import (
"time" "time"
"github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/datastore"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/boltdb" "github.com/docker/libkv/store/boltdb"
) )

View File

@ -8,7 +8,6 @@ import (
"github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
_ "github.com/docker/docker/libnetwork/testutils"
) )
func TestInvalidConfig(t *testing.T) { func TestInvalidConfig(t *testing.T) {

View File

@ -6,7 +6,6 @@ import (
"testing" "testing"
"github.com/docker/docker/libnetwork/options" "github.com/docker/docker/libnetwork/options"
_ "github.com/docker/docker/libnetwork/testutils"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
) )

View File

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

View File

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

View File

@ -6,7 +6,6 @@ import (
"testing" "testing"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
) )

View File

@ -6,7 +6,6 @@ import (
"testing" "testing"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
) )

View File

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

View File

@ -17,7 +17,6 @@ import (
"github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/discoverapi"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/libkv/store/consul" "github.com/docker/libkv/store/consul"
"github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"

View File

@ -9,7 +9,6 @@ import (
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/idm" "github.com/docker/docker/libnetwork/idm"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"

View File

@ -5,8 +5,6 @@ package overlay
import ( import (
"net" "net"
"testing" "testing"
_ "github.com/docker/docker/libnetwork/testutils"
) )
func TestPeerMarshal(t *testing.T) { func TestPeerMarshal(t *testing.T) {

View File

@ -18,7 +18,6 @@ import (
"github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/discoverapi"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/plugins"
) )

View File

@ -14,9 +14,6 @@ import (
remoteIpam "github.com/docker/docker/libnetwork/ipams/remote" remoteIpam "github.com/docker/docker/libnetwork/ipams/remote"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
// this takes care of the incontainer flag
_ "github.com/docker/docker/libnetwork/testutils"
) )
const mockDriverName = "mock-driver" const mockDriverName = "mock-driver"

View File

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

View File

@ -5,7 +5,6 @@ import (
"testing" "testing"
mapset "github.com/deckarep/golang-set" mapset "github.com/deckarep/golang-set"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/pkg/discovery" "github.com/docker/docker/pkg/discovery"
) )

View File

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

View File

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

View File

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

View File

@ -17,7 +17,6 @@ import (
"github.com/docker/docker/libnetwork/bitseq" "github.com/docker/docker/libnetwork/bitseq"
"github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipamapi"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/boltdb" "github.com/docker/libkv/store/boltdb"

View File

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

View File

@ -14,7 +14,6 @@ import (
"testing" "testing"
"github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipamapi"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/plugins"
) )

View File

@ -6,7 +6,6 @@ import (
"github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipamapi"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
_ "github.com/docker/docker/libnetwork/testutils"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
) )

View File

@ -4,7 +4,6 @@ import (
"net" "net"
"testing" "testing"
_ "github.com/docker/docker/libnetwork/testutils"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )

View File

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

View File

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

View File

@ -18,9 +18,6 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/poll" "gotest.tools/v3/poll"
// this takes care of the incontainer flag
_ "github.com/docker/docker/libnetwork/testutils"
) )
var dbPort int32 = 10000 var dbPort int32 = 10000

View File

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

View File

@ -6,8 +6,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
_ "github.com/docker/docker/libnetwork/testutils"
) )
func TestReadWriteKnobs(t *testing.T) { func TestReadWriteKnobs(t *testing.T) {

View File

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

View File

@ -6,7 +6,6 @@ import (
"testing" "testing"
"github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/iptables"
_ "github.com/docker/docker/libnetwork/testutils"
) )
func init() { func init() {

View File

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

View File

@ -4,7 +4,6 @@ import (
"net" "net"
"testing" "testing"
_ "github.com/docker/docker/libnetwork/testutils"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
) )