From 0d0dcfc02f75a911ea8fbedeb6b074cd60a2eeb3 Mon Sep 17 00:00:00 2001 From: smarkm Date: Wed, 21 Aug 2019 08:40:38 +0800 Subject: [PATCH] Cleanup netns after test suit Signed-off-by: smarkm --- plugins/main/bridge/bridge_test.go | 3 ++- plugins/main/host-device/host-device_test.go | 3 ++- plugins/main/ipvlan/ipvlan_test.go | 1 + plugins/main/loopback/loopback_test.go | 1 + plugins/main/macvlan/macvlan_test.go | 1 + plugins/main/ptp/ptp_test.go | 1 + plugins/main/vlan/vlan_test.go | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go index 89a05b93..ed2e888c 100644 --- a/plugins/main/bridge/bridge_test.go +++ b/plugins/main/bridge/bridge_test.go @@ -27,7 +27,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/types" - "github.com/containernetworking/cni/pkg/types/020" + types020 "github.com/containernetworking/cni/pkg/types/020" "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" @@ -1125,6 +1125,7 @@ var _ = Describe("bridge Operations", func() { AfterEach(func() { Expect(os.RemoveAll(dataDir)).To(Succeed()) Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) It("creates a bridge", func() { diff --git a/plugins/main/host-device/host-device_test.go b/plugins/main/host-device/host-device_test.go index b6b46b1c..3671cef2 100644 --- a/plugins/main/host-device/host-device_test.go +++ b/plugins/main/host-device/host-device_test.go @@ -233,7 +233,8 @@ var _ = Describe("base functionality", func() { }) AfterEach(func() { - originalNS.Close() + Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) It("Works with a valid config without IPAM", func() { diff --git a/plugins/main/ipvlan/ipvlan_test.go b/plugins/main/ipvlan/ipvlan_test.go index 64503d2e..2da00659 100644 --- a/plugins/main/ipvlan/ipvlan_test.go +++ b/plugins/main/ipvlan/ipvlan_test.go @@ -297,6 +297,7 @@ var _ = Describe("ipvlan Operations", func() { AfterEach(func() { Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) It("creates an ipvlan link in a non-default namespace", func() { diff --git a/plugins/main/loopback/loopback_test.go b/plugins/main/loopback/loopback_test.go index 13693833..4bfd6e0b 100644 --- a/plugins/main/loopback/loopback_test.go +++ b/plugins/main/loopback/loopback_test.go @@ -54,6 +54,7 @@ var _ = Describe("Loopback", func() { AfterEach(func() { Expect(networkNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(networkNS)).To(Succeed()) }) Context("when given a network namespace", func() { diff --git a/plugins/main/macvlan/macvlan_test.go b/plugins/main/macvlan/macvlan_test.go index b7740517..9ee2d582 100644 --- a/plugins/main/macvlan/macvlan_test.go +++ b/plugins/main/macvlan/macvlan_test.go @@ -123,6 +123,7 @@ var _ = Describe("macvlan Operations", func() { AfterEach(func() { Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) It("creates an macvlan link in a non-default namespace", func() { diff --git a/plugins/main/ptp/ptp_test.go b/plugins/main/ptp/ptp_test.go index 6efdc098..bedc2dda 100644 --- a/plugins/main/ptp/ptp_test.go +++ b/plugins/main/ptp/ptp_test.go @@ -98,6 +98,7 @@ var _ = Describe("ptp Operations", func() { AfterEach(func() { Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) doTest := func(conf string, numIPs int) { diff --git a/plugins/main/vlan/vlan_test.go b/plugins/main/vlan/vlan_test.go index e845a84c..cdff984f 100644 --- a/plugins/main/vlan/vlan_test.go +++ b/plugins/main/vlan/vlan_test.go @@ -121,6 +121,7 @@ var _ = Describe("vlan Operations", func() { AfterEach(func() { Expect(originalNS.Close()).To(Succeed()) + Expect(testutils.UnmountNS(originalNS)).To(Succeed()) }) It("creates an vlan link in a non-default namespace with given MTU", func() {