kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix CircleCI

Browse source 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2016-08-30 11:46:09 -07:00
parent b551a61694
commit 7912e19488
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libnetwork/netutils/utils_test.go
View file

@ -213,35 +213,44 @@ func TestNetworkRequest(t *testing.T) {
defer testutils.SetupTestOSContext(t)() defer testutils.SetupTestOSContext(t)()
ipamutils.InitNetworks() ipamutils.InitNetworks()
_, exp, err := net.ParseCIDR("172.17.0.0/16")
if err != nil {
t.Fatal(err)
}
nw, err := FindAvailableNetwork(ipamutils.PredefinedBroadNetworks) nw, err := FindAvailableNetwork(ipamutils.PredefinedBroadNetworks)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !types.CompareIPNet(exp, nw) {
t.Fatalf("exected %s. got %s", exp, nw) var found bool
for _, exp := range ipamutils.PredefinedBroadNetworks {
if types.CompareIPNet(exp, nw) {
found = true
break
}
} }
_, exp, err = net.ParseCIDR("10.0.0.0/24") if !found {
if err != nil { t.Fatalf("Found unexpected broad network %s", nw)
t.Fatal(err)
} }
nw, err = FindAvailableNetwork(ipamutils.PredefinedGranularNetworks) nw, err = FindAvailableNetwork(ipamutils.PredefinedGranularNetworks)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !types.CompareIPNet(exp, nw) {
t.Fatalf("exected %s. got %s", exp, nw) found = false
for _, exp := range ipamutils.PredefinedGranularNetworks {
if types.CompareIPNet(exp, nw) {
found = true
break
}
}
if !found {
t.Fatalf("Found unexpected granular network %s", nw)
} }
// Add iface and ssert returned address on request // Add iface and ssert returned address on request
createInterface(t, "test", "172.17.42.1/16") createInterface(t, "test", "172.17.42.1/16")
_, exp, err = net.ParseCIDR("172.18.0.0/16") _, exp, err := net.ParseCIDR("172.18.0.0/16")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }