libnetwork: prefer DeferCleanup to AfterEach in tests

In Ginkgo, there might be some unexpected behavior when mising AfterEach
and DeferCleanup (see [1], [2]), so let's switch to DeferCleanup.

[1]: containers/podman@3c0176b2d0dd3
[2]: onsi/ginkgo#1360

Reported-by: Paul Holzinger <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

Diff for: libnetwork/cni/config_test.go

@@ -31,6 +31,9 @@ var _ = Describe("Config", func() {
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 		logrus.SetLevel(logrus.InfoLevel)
+		DeferCleanup(func() {
+			logrus.SetLevel(logrus.InfoLevel)
+		})
 	})
 
 	JustBeforeEach(func() {
@@ -41,10 +44,6 @@ var _ = Describe("Config", func() {
 		}
 	})
 
-	AfterEach(func() {
-		logrus.SetLevel(logrus.InfoLevel)
-	})
-
 	Context("basic network config tests", func() {
 		It("check default network config exists", func() {
 			networks, err := libpodNet.NetworkList()

Diff for: libnetwork/cni/run_test.go

@@ -86,12 +86,24 @@ var _ = Describe("run CNI", func() {
 		if err != nil {
 			Fail("Failed to create netns")
 		}
+		DeferCleanup(func() {
+			_ = netns.UnmountNS(netNSTest.Path())
+			_ = netNSTest.Close()
+		})
 
 		netNSContainer, err = netns.NewNS()
 		if err != nil {
 			Fail("Failed to create netns")
 		}
+		DeferCleanup(func() {
+			_ = netns.UnmountNS(netNSContainer.Path())
+			_ = netNSContainer.Close()
+		})
+
 		logrus.SetLevel(logrus.WarnLevel)
+		DeferCleanup(func() {
+			logrus.SetLevel(logrus.InfoLevel)
+		})
 	})
 
 	JustBeforeEach(func() {
@@ -102,16 +114,6 @@ var _ = Describe("run CNI", func() {
 		}
 	})
 
-	AfterEach(func() {
-		logrus.SetLevel(logrus.InfoLevel)
-
-		_ = netns.UnmountNS(netNSTest.Path())
-		_ = netNSTest.Close()
-
-		_ = netns.UnmountNS(netNSContainer.Path())
-		_ = netNSContainer.Close()
-	})
-
 	Context("network setup test", func() {
 		It("run with default config", func() {
 			runTest(func() {

Diff for: libnetwork/netavark/run_test.go

@@ -61,18 +61,23 @@ var _ = Describe("run netavark", func() {
 			Skip("NETAVARK_BINARY not set skip run tests")
 		}
 
-		// set the logrus settings
-		logrus.SetLevel(logrus.TraceLevel)
-		// disable extra quotes so we can easily copy the netavark command
-		logrus.SetFormatter(&logrus.TextFormatter{DisableQuote: true})
-		logrus.SetOutput(os.Stderr)
 		// The tests need root privileges.
 		// Technically we could work around that by using user namespaces and
 		// the rootless cni code but this is to much work to get it right for a unit test.
 		if unshare.IsRootless() {
 			Skip("this test needs to be run as root")
 		}
 
+		// set the logrus settings
+		logrus.SetLevel(logrus.TraceLevel)
+		// disable extra quotes so we can easily copy the netavark command
+		logrus.SetFormatter(&logrus.TextFormatter{DisableQuote: true})
+		logrus.SetOutput(os.Stderr)
+		DeferCleanup(func() {
+			logrus.SetFormatter(&logrus.TextFormatter{})
+			logrus.SetLevel(logrus.InfoLevel)
+		})
+
 		t := GinkgoT()
 		confDir = t.TempDir()
 
@@ -81,12 +86,19 @@ var _ = Describe("run netavark", func() {
 		if err != nil {
 			Fail("Failed to create netns")
 		}
+		DeferCleanup(func() {
+			_ = netns.UnmountNS(netNSTest.Path())
+			_ = netNSTest.Close()
+		})
 
 		netNSContainer, err = netns.NewNS()
 		if err != nil {
 			Fail("Failed to create netns")
 		}
-
+		DeferCleanup(func() {
+			_ = netns.UnmountNS(netNSContainer.Path())
+			_ = netNSContainer.Close()
+		})
 		// Force iptables driver, firewalld is broken inside the extra
 		// namespace because it still connects to firewalld on the host.
 		t.Setenv("NETAVARK_FW", "iptables")
@@ -103,12 +115,6 @@ var _ = Describe("run netavark", func() {
 	AfterEach(func() {
 		logrus.SetFormatter(&logrus.TextFormatter{})
 		logrus.SetLevel(logrus.InfoLevel)
-
-		_ = netns.UnmountNS(netNSTest.Path())
-		_ = netNSTest.Close()
-
-		_ = netns.UnmountNS(netNSContainer.Path())
-		_ = netNSContainer.Close()
 	})
 
 	It("test basic setup", func() {