From 2ab19b772773e69299e823f0cf3dd6e871f9dfd1 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 17 Apr 2015 21:18:55 -0700 Subject: [PATCH] Fix libnetwork_test.go - It is working on default netns, leaving many vethxxx to cleanup after it runs Signed-off-by: Alessandro Boch --- libnetwork_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libnetwork_test.go b/libnetwork_test.go index 2f6a100..4237932 100644 --- a/libnetwork_test.go +++ b/libnetwork_test.go @@ -7,6 +7,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/libnetwork" _ "github.com/docker/libnetwork/drivers/bridge" + "github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/pkg/options" ) @@ -29,6 +30,7 @@ func createTestNetwork(networkType, networkName string, option options.Generic) } func TestSimplebridge(t *testing.T) { + defer netutils.SetupTestNetNS(t)() ip, subnet, err := net.ParseCIDR("192.168.100.1/24") if err != nil { t.Fatal(err) @@ -80,6 +82,7 @@ func TestSimplebridge(t *testing.T) { } func TestUnknownDriver(t *testing.T) { + defer netutils.SetupTestNetNS(t)() _, err := createTestNetwork("unknowndriver", "testnetwork", options.Generic{}) if err == nil { t.Fatal("Expected to fail. But instead succeeded") @@ -119,6 +122,7 @@ func TestNoInitDriver(t *testing.T) { } func TestDuplicateNetwork(t *testing.T) { + defer netutils.SetupTestNetNS(t)() controller := libnetwork.New() option := options.Generic{} @@ -182,6 +186,7 @@ func TestNetworkID(t *testing.T) { } func TestDeleteNetworkWithActiveEndpoints(t *testing.T) { + defer netutils.SetupTestNetNS(t)() option := options.Generic{ "BridgeName": bridgeName, "AllowNonDefaultBridge": true} @@ -216,6 +221,7 @@ func TestDeleteNetworkWithActiveEndpoints(t *testing.T) { } func TestUnknownNetwork(t *testing.T) { + defer netutils.SetupTestNetNS(t)() option := options.Generic{ "BridgeName": bridgeName, "AllowNonDefaultBridge": true} @@ -241,6 +247,7 @@ func TestUnknownNetwork(t *testing.T) { } func TestUnknownEndpoint(t *testing.T) { + defer netutils.SetupTestNetNS(t)() ip, subnet, err := net.ParseCIDR("192.168.100.1/24") if err != nil { t.Fatal(err)