ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #375 from smarkm/master

Browse Source 
Fixes #342, cleanup netns after test suite
This commit is contained in:
Casey Callendrello 2019-08-28 17:55:36 +02:00 committed by GitHub
commit f81a529ebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/bridge/bridge_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types" "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/cni/pkg/types/current"
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils" "github.com/containernetworking/plugins/pkg/testutils"
@ -1125,6 +1125,7 @@ var _ = Describe("bridge Operations", func() {
AfterEach(func() { AfterEach(func() {
Expect(os.RemoveAll(dataDir)).To(Succeed()) Expect(os.RemoveAll(dataDir)).To(Succeed())
Expect(originalNS.Close()).To(Succeed()) Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
}) })
It("creates a bridge", func() { It("creates a bridge", func() {

3
plugins/main/host-device/host-device_test.go
View File

@ -233,7 +233,8 @@ var _ = Describe("base functionality", func() {
}) })
AfterEach(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() { It("Works with a valid config without IPAM", func() {

1
plugins/main/ipvlan/ipvlan_test.go
View File

@ -297,6 +297,7 @@ var _ = Describe("ipvlan Operations", func() {
AfterEach(func() { AfterEach(func() {
Expect(originalNS.Close()).To(Succeed()) Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
}) })
It("creates an ipvlan link in a non-default namespace", func() { It("creates an ipvlan link in a non-default namespace", func() {

1
plugins/main/loopback/loopback_test.go
View File

@ -54,6 +54,7 @@ var _ = Describe("Loopback", func() {
AfterEach(func() { AfterEach(func() {
Expect(networkNS.Close()).To(Succeed()) Expect(networkNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(networkNS)).To(Succeed())
}) })
Context("when given a network namespace", func() { Context("when given a network namespace", func() {

1
plugins/main/macvlan/macvlan_test.go
View File

@ -123,6 +123,7 @@ var _ = Describe("macvlan Operations", func() {
AfterEach(func() { AfterEach(func() {
Expect(originalNS.Close()).To(Succeed()) Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
}) })
It("creates an macvlan link in a non-default namespace", func() { It("creates an macvlan link in a non-default namespace", func() {

1
plugins/main/ptp/ptp_test.go
View File

@ -98,6 +98,7 @@ var _ = Describe("ptp Operations", func() {
AfterEach(func() { AfterEach(func() {
Expect(originalNS.Close()).To(Succeed()) Expect(originalNS.Close()).To(Succeed())
Expect(testutils.UnmountNS(originalNS)).To(Succeed())
}) })
doTest := func(conf string, numIPs int) { doTest := func(conf string, numIPs int) {

1
plugins/main/vlan/vlan_test.go
View File

@ -121,6 +121,7 @@ var _ = Describe("vlan Operations", func() {
AfterEach(func() { AfterEach(func() {
Expect(originalNS.Close()).To(Succeed()) 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() { It("creates an vlan link in a non-default namespace with given MTU", func() {