Skip to content

Migrate to gotest.tools :) #2220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcrisciani merged 2 commits into from
Jul 6, 2018
Merged

Migrate to gotest.tools :) #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9409540
Remove unused deps from vendor.conf
vdemeester Jul 4, 2018
b48137d
Migrate to gotest.tools :)
vdemeester Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions datastore/datastore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/docker/libnetwork/options"
_ "github.com/docker/libnetwork/testutils"
"github.com/stretchr/testify/assert"
"gotest.tools/assert"
)

var dummyKey = "dummy"
Expand Down Expand Up @@ -68,12 +68,12 @@ func TestKVObjectFlatKey(t *testing.T) {
func TestAtomicKVObjectFlatKey(t *testing.T) {
store := NewTestDataStore()
expected := dummyKVObject("1111", true)
assert.False(t, expected.Exists())
assert.Check(t, !expected.Exists())
err := store.PutObjectAtomic(expected)
if err != nil {
Copy link
Member

@thaJeztah thaJeztah Jul 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For someone that has some time to spend; these can be changed to use assert.NilError(t, err)

t.Fatal(err)
}
assert.True(t, expected.Exists())
assert.Check(t, expected.Exists())

// PutObjectAtomic automatically sets the Index again. Hence the following must pass.

Expand Down Expand Up @@ -104,7 +104,7 @@ func TestAtomicKVObjectFlatKey(t *testing.T) {
if err != nil {
t.Fatal(err)
}
assert.True(t, newObj.Exists())
assert.Check(t, newObj.Exists())
err = store.PutObjectAtomic(&n)
if err != nil {
t.Fatal(err)
Expand Down
26 changes: 13 additions & 13 deletions drivers/overlay/ovmanager/ovmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/docker/libnetwork/netlabel"
_ "github.com/docker/libnetwork/testutils"
"github.com/docker/libnetwork/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

func newDriver(t *testing.T) *driver {
Expand All @@ -21,15 +21,15 @@ func newDriver(t *testing.T) *driver {
}

vxlanIdm, err := idm.New(nil, "vxlan-id", vxlanIDStart, vxlanIDEnd)
require.NoError(t, err)
assert.NilError(t, err)

d.vxlanIdm = vxlanIdm
return d
}

func parseCIDR(t *testing.T, ipnet string) *net.IPNet {
subnet, err := types.ParseCIDR(ipnet)
require.NoError(t, err)
assert.NilError(t, err)
return subnet
}

Expand All @@ -46,14 +46,14 @@ func TestNetworkAllocateFree(t *testing.T) {
}

vals, err := d.NetworkAllocate("testnetwork", nil, ipamData, nil)
require.NoError(t, err)
assert.NilError(t, err)

vxlanIDs, ok := vals[netlabel.OverlayVxlanIDList]
assert.Equal(t, true, ok)
assert.Equal(t, 2, len(strings.Split(vxlanIDs, ",")))
assert.Check(t, is.Equal(true, ok))
assert.Check(t, is.Len(strings.Split(vxlanIDs, ","), 2))

err = d.NetworkFree("testnetwork")
require.NoError(t, err)
assert.NilError(t, err)
}

func TestNetworkAllocateUserDefinedVNIs(t *testing.T) {
Expand All @@ -73,16 +73,16 @@ func TestNetworkAllocateUserDefinedVNIs(t *testing.T) {
options[netlabel.OverlayVxlanIDList] = fmt.Sprintf("%d,%d,%d", vxlanIDStart, vxlanIDStart+1, vxlanIDStart+2)

vals, err := d.NetworkAllocate("testnetwork", options, ipamData, nil)
require.NoError(t, err)
assert.NilError(t, err)

vxlanIDs, ok := vals[netlabel.OverlayVxlanIDList]
assert.Equal(t, true, ok)
assert.Check(t, is.Equal(true, ok))

// We should only get exactly the same number of vnis as
// subnets. No more, no less, even if we passed more vnis.
assert.Equal(t, 2, len(strings.Split(vxlanIDs, ",")))
assert.Equal(t, fmt.Sprintf("%d,%d", vxlanIDStart, vxlanIDStart+1), vxlanIDs)
assert.Check(t, is.Len(strings.Split(vxlanIDs, ","), 2))
assert.Check(t, is.Equal(fmt.Sprintf("%d,%d", vxlanIDStart, vxlanIDStart+1), vxlanIDs))

err = d.NetworkFree("testnetwork")
require.NoError(t, err)
assert.NilError(t, err)
}
31 changes: 16 additions & 15 deletions drvregistry/drvregistry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
builtinIpam "github.com/docker/libnetwork/ipams/builtin"
nullIpam "github.com/docker/libnetwork/ipams/null"
remoteIpam "github.com/docker/libnetwork/ipams/remote"
"github.com/stretchr/testify/assert"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"

// this takes care of the incontainer flag
_ "github.com/docker/libnetwork/testutils"
Expand Down Expand Up @@ -128,46 +129,46 @@ func TestAddDriver(t *testing.T) {
reg := getNew(t)

err := reg.AddDriver(mockDriverName, mockDriverInit, nil)
assert.NoError(t, err)
assert.NilError(t, err)
}

func TestAddDuplicateDriver(t *testing.T) {
reg := getNew(t)

err := reg.AddDriver(mockDriverName, mockDriverInit, nil)
assert.NoError(t, err)
assert.NilError(t, err)

// Try adding the same driver
err = reg.AddDriver(mockDriverName, mockDriverInit, nil)
assert.Error(t, err)
assert.Check(t, is.ErrorContains(err, ""))
}

func TestIPAMDefaultAddressSpaces(t *testing.T) {
reg := getNew(t)

as1, as2, err := reg.IPAMDefaultAddressSpaces("default")
assert.NoError(t, err)
assert.NotEqual(t, as1, "")
assert.NotEqual(t, as2, "")
assert.NilError(t, err)
assert.Check(t, as1 != "")
assert.Check(t, as2 != "")
}

func TestDriver(t *testing.T) {
reg := getNew(t)

err := reg.AddDriver(mockDriverName, mockDriverInit, nil)
assert.NoError(t, err)
assert.NilError(t, err)

d, cap := reg.Driver(mockDriverName)
assert.NotEqual(t, d, nil)
assert.NotEqual(t, cap, nil)
assert.Check(t, d != nil)
assert.Check(t, cap != nil)
}

func TestIPAM(t *testing.T) {
reg := getNew(t)

i, cap := reg.IPAM("default")
assert.NotEqual(t, i, nil)
assert.NotEqual(t, cap, nil)
assert.Check(t, i != nil)
assert.Check(t, cap != nil)
}

func TestWalkIPAMs(t *testing.T) {
Expand All @@ -180,20 +181,20 @@ func TestWalkIPAMs(t *testing.T) {
})

sort.Strings(ipams)
assert.Equal(t, ipams, []string{"default", "null"})
assert.Check(t, is.DeepEqual(ipams, []string{"default", "null"}))
}

func TestWalkDrivers(t *testing.T) {
reg := getNew(t)

err := reg.AddDriver(mockDriverName, mockDriverInit, nil)
assert.NoError(t, err)
assert.NilError(t, err)

var driverName string
reg.WalkDrivers(func(name string, driver driverapi.Driver, capability driverapi.Capability) bool {
driverName = name
return false
})

assert.Equal(t, driverName, mockDriverName)
assert.Check(t, is.Equal(driverName, mockDriverName))
}
43 changes: 22 additions & 21 deletions ipam/allocator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
"github.com/docker/libnetwork/ipamutils"
_ "github.com/docker/libnetwork/testutils"
"github.com/docker/libnetwork/types"
"github.com/stretchr/testify/assert"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

const (
Expand Down Expand Up @@ -287,23 +288,23 @@ func TestAddSubnets(t *testing.T) {
func TestDoublePoolRelease(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

pid0, _, _, err := a.RequestPool(localAddressSpace, "10.0.0.0/8", "", nil, false)
assert.NoError(t, err)
assert.NilError(t, err)

err = a.ReleasePool(pid0)
assert.NoError(t, err)
assert.NilError(t, err)

err = a.ReleasePool(pid0)
assert.Error(t, err)
assert.Check(t, is.ErrorContains(err, ""))
}
}

func TestAddReleasePoolID(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

var k0, k1 SubnetKey
aSpace, err := a.getAddrSpace(localAddressSpace)
Expand Down Expand Up @@ -437,7 +438,7 @@ func TestAddReleasePoolID(t *testing.T) {
func TestPredefinedPool(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

if _, err := a.getPredefinedPool("blue", false); err == nil {
t.Fatal("Expected failure for non default addr space")
Expand Down Expand Up @@ -465,7 +466,7 @@ func TestPredefinedPool(t *testing.T) {
func TestRemoveSubnet(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

a.addrSpaces["splane"] = &addrSpace{
id: dsConfigKey + "/" + "splane",
Expand Down Expand Up @@ -509,7 +510,7 @@ func TestRemoveSubnet(t *testing.T) {
func TestGetSameAddress(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

a.addrSpaces["giallo"] = &addrSpace{
id: dsConfigKey + "/" + "giallo",
Expand Down Expand Up @@ -540,7 +541,7 @@ func TestGetSameAddress(t *testing.T) {
func TestPoolAllocationReuse(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

// First get all pools until they are exhausted to
pList := []string{}
Expand Down Expand Up @@ -579,7 +580,7 @@ func TestPoolAllocationReuse(t *testing.T) {
func TestGetAddressSubPoolEqualPool(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

// Requesting a subpool of same size of the master pool should not cause any problem on ip allocation
pid, _, _, err := a.RequestPool(localAddressSpace, "172.18.0.0/16", "172.18.0.0/16", nil, false)
Expand All @@ -597,7 +598,7 @@ func TestGetAddressSubPoolEqualPool(t *testing.T) {
func TestRequestReleaseAddressFromSubPool(t *testing.T) {
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

a.addrSpaces["rosso"] = &addrSpace{
id: dsConfigKey + "/" + "rosso",
Expand Down Expand Up @@ -730,7 +731,7 @@ func TestSerializeRequestReleaseAddressFromSubPool(t *testing.T) {
ipamapi.AllocSerialPrefix: "true"}
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

a.addrSpaces["rosso"] = &addrSpace{
id: dsConfigKey + "/" + "rosso",
Expand Down Expand Up @@ -880,7 +881,7 @@ func TestRequestSyntaxCheck(t *testing.T) {

for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

a.addrSpaces[as] = &addrSpace{
id: dsConfigKey + "/" + as,
Expand Down Expand Up @@ -1036,20 +1037,20 @@ func TestOverlappingRequests(t *testing.T) {
for _, store := range []bool{false, true} {
for _, tc := range input {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

// Set up some existing allocations. This should always succeed.
for _, env := range tc.environment {
_, _, _, err = a.RequestPool(localAddressSpace, env, "", nil, false)
assert.NoError(t, err)
assert.NilError(t, err)
}

// Make the test allocation.
_, _, _, err = a.RequestPool(localAddressSpace, tc.subnet, "", nil, false)
if tc.ok {
assert.NoError(t, err)
assert.NilError(t, err)
} else {
assert.Error(t, err)
assert.Check(t, is.ErrorContains(err, ""))
}
}
}
Expand All @@ -1062,7 +1063,7 @@ func TestRelease(t *testing.T) {

for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

pid, _, _, err := a.RequestPool(localAddressSpace, subnet, "", nil, false)
if err != nil {
Expand Down Expand Up @@ -1170,7 +1171,7 @@ func assertNRequests(t *testing.T, subnet string, numReq int, lastExpectedIP str
lastIP := net.ParseIP(lastExpectedIP)
for _, store := range []bool{false, true} {
a, err := getAllocator(store)
assert.NoError(t, err)
assert.NilError(t, err)

pid, _, _, err := a.RequestPool(localAddressSpace, subnet, "", nil, false)
if err != nil {
Expand Down Expand Up @@ -1232,7 +1233,7 @@ func TestAllocateRandomDeallocate(t *testing.T) {

func testAllocateRandomDeallocate(t *testing.T, pool, subPool string, num int, store bool) {
ds, err := randomLocalStore(store)
assert.NoError(t, err)
assert.NilError(t, err)

a, err := NewAllocator(ds, nil)
if err != nil {
Expand Down
11 changes: 6 additions & 5 deletions ipam/parallel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
"time"

"github.com/docker/libnetwork/ipamapi"
"github.com/stretchr/testify/assert"
"golang.org/x/sync/semaphore"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

const (
Expand Down Expand Up @@ -217,7 +218,7 @@ func allocate(t *testing.T, tctx *testContext, parallel int64) {
tctx.ipMap[ip.String()] = true
}

assert.Len(t, tctx.ipList, tctx.maxIP)
assert.Check(t, is.Len(tctx.ipList, tctx.maxIP))
if len(tctx.ipList) != tctx.maxIP {
t.Fatal("missmatch number allocation")
}
Expand Down Expand Up @@ -281,12 +282,12 @@ func release(t *testing.T, tctx *testContext, mode releaseMode, parallel int64)

// check if it is really free
_, _, err := tctx.a.RequestAddress(tctx.pid, ip.IP, nil)
assert.NoError(t, err, "ip %v not properly released", ip)
assert.Check(t, err, "ip %v not properly released", ip)
if err != nil {
t.Fatalf("ip %v not properly released, error:%v", ip, err)
}
err = tctx.a.ReleaseAddress(tctx.pid, ip.IP)
assert.NoError(t, err)
assert.NilError(t, err)

if there, ok := tctx.ipMap[ip.String()]; !ok || !there {
t.Fatalf("ip %v got double deallocated", ip)
Expand All @@ -300,5 +301,5 @@ func release(t *testing.T, tctx *testContext, mode releaseMode, parallel int64)
}
}

assert.Len(t, tctx.ipList, tctx.maxIP-length)
assert.Check(t, is.Len(tctx.ipList, tctx.maxIP-length))
}
Loading