Merge pull request #2417 from kolyshkin/use-t

*_test.go: use t.TempDir, t.Setenv

Author: openshift-merge-bot[bot]

Diff for: libnetwork/cni/config_test.go

@@ -26,14 +26,14 @@ var _ = Describe("Config", func() {
 	)
 
 	BeforeEach(func() {
-		var err error
-		cniConfDir, err = os.MkdirTemp("", "podman_cni_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		t := GinkgoT()
+		cniConfDir = t.TempDir()
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 		logrus.SetLevel(logrus.InfoLevel)
+		DeferCleanup(func() {
+			logrus.SetLevel(logrus.InfoLevel)
+		})
 	})
 
 	JustBeforeEach(func() {
@@ -44,11 +44,6 @@ var _ = Describe("Config", func() {
 		}
 	})
 
-	AfterEach(func() {
-		logrus.SetLevel(logrus.InfoLevel)
-		os.RemoveAll(cniConfDir)
-	})
-
 	Context("basic network config tests", func() {
 		It("check default network config exists", func() {
 			networks, err := libpodNet.NetworkList()

Diff for: libnetwork/cni/run_test.go

@@ -76,24 +76,34 @@ var _ = Describe("run CNI", func() {
 			Skip("this test needs to be run as root")
 		}
 
-		var err error
-		cniConfDir, err = os.MkdirTemp("", "podman_cni_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		t := GinkgoT()
+		cniConfDir = t.TempDir()
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 
+		var err error
 		netNSTest, err = netns.NewNS()
 		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() {
@@ -104,17 +114,6 @@ var _ = Describe("run CNI", func() {
 		}
 	})
 
-	AfterEach(func() {
-		logrus.SetLevel(logrus.InfoLevel)
-		_ = os.RemoveAll(cniConfDir)
-
-		_ = 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() {
@@ -790,8 +789,8 @@ var _ = Describe("run CNI", func() {
 					},
 				}
 
-				os.Setenv("CNI_ARGS", "IP="+ip)
-				defer os.Unsetenv("CNI_ARGS")
+				t := GinkgoT()
+				t.Setenv("CNI_ARGS", "IP="+ip)
 
 				res, err := libpodNet.Setup(netNSContainer.Path(), setupOpts)
 				Expect(err).ToNot(HaveOccurred())

Diff for: libnetwork/netavark/config_test.go

@@ -28,11 +28,8 @@ var _ = Describe("Config", func() {
 	)
 
 	BeforeEach(func() {
-		var err error
-		networkConfDir, err = os.MkdirTemp("", "podman_netavark_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		t := GinkgoT()
+		networkConfDir = t.TempDir()
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 	})
@@ -45,10 +42,6 @@ var _ = Describe("Config", func() {
 		}
 	})
 
-	AfterEach(func() {
-		os.RemoveAll(networkConfDir)
-	})
-
 	Context("basic network config tests", func() {
 		It("check default network config exists", func() {
 			networks, err := libpodNet.NetworkList()

Diff for: libnetwork/netavark/ipam_test.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/containers/common/libnetwork/types"
 	"github.com/containers/common/pkg/config"
@@ -23,11 +22,8 @@ var _ = Describe("IPAM", func() {
 	)
 
 	BeforeEach(func() {
-		var err error
-		networkConfDir, err = os.MkdirTemp("", "podman_netavark_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		t := GinkgoT()
+		networkConfDir = t.TempDir()
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 	})
@@ -48,10 +44,6 @@ var _ = Describe("IPAM", func() {
 		Expect(err).ToNot(HaveOccurred())
 	})
 
-	AfterEach(func() {
-		os.RemoveAll(networkConfDir)
-	})
-
 	It("simple ipam alloc", func() {
 		netName := types.DefaultNetworkName
 		for i := 2; i < 100; i++ {

Diff for: libnetwork/netavark/plugin_test.go

@@ -4,7 +4,6 @@ package netavark_test
 
 import (
 	"bytes"
-	"os"
 	"path/filepath"
 
 	"github.com/containers/common/libnetwork/types"
@@ -23,11 +22,8 @@ var _ = Describe("Plugins", func() {
 	)
 
 	BeforeEach(func() {
-		var err error
-		networkConfDir, err = os.MkdirTemp("", "podman_netavark_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		t := GinkgoT()
+		networkConfDir = t.TempDir()
 		logBuffer = bytes.Buffer{}
 		logrus.SetOutput(&logBuffer)
 	})
@@ -40,10 +36,6 @@ var _ = Describe("Plugins", func() {
 		}
 	})
 
-	AfterEach(func() {
-		os.RemoveAll(networkConfDir)
-	})
-
 	It("create plugin network", func() {
 		network := types.Network{Driver: pluginName}
 		network1, err := libpodNet.NetworkCreate(network, nil)

Diff for: libnetwork/netavark/run_test.go

@@ -61,37 +61,47 @@ 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")
 		}
 
-		var err error
-		confDir, err = os.MkdirTemp("", "podman_netavark_test")
-		if err != nil {
-			Fail("Failed to create tmpdir")
-		}
+		// 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()
+
+		var err error
 		netNSTest, err = netns.NewNS()
 		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.
-		_ = os.Setenv("NETAVARK_FW", "iptables")
+		t.Setenv("NETAVARK_FW", "iptables")
 	})
 
 	JustBeforeEach(func() {
@@ -105,15 +115,6 @@ var _ = Describe("run netavark", func() {
 	AfterEach(func() {
 		logrus.SetFormatter(&logrus.TextFormatter{})
 		logrus.SetLevel(logrus.InfoLevel)
-		_ = os.RemoveAll(confDir)
-
-		_ = netns.UnmountNS(netNSTest.Path())
-		_ = netNSTest.Close()
-
-		_ = netns.UnmountNS(netNSContainer.Path())
-		_ = netNSContainer.Close()
-
-		_ = os.Unsetenv("NETAVARK_FW")
 	})
 
 	It("test basic setup", func() {

Diff for: pkg/auth/auth_test.go

@@ -13,35 +13,28 @@ import (
 var _ = Describe("Config", func() {
 	Describe("ValidateAuth", func() {
 		It("validate GetDefaultAuthFile", func() {
+			t := GinkgoT()
 			// Given
-			oldDockerConf, envDockerSet := os.LookupEnv("DOCKER_CONFIG")
-			os.Setenv("DOCKER_CONFIG", "/tmp")
-			oldConf, envSet := os.LookupEnv("REGISTRY_AUTH_FILE")
-			os.Setenv("REGISTRY_AUTH_FILE", "/tmp/registry.file")
+			t.Setenv("DOCKER_CONFIG", "/tmp")
+			t.Setenv("REGISTRY_AUTH_FILE", "/tmp/registry.file")
 			// When			// When
 			authFile := GetDefaultAuthFile()
 			// Then
 			gomega.Expect(authFile).To(gomega.BeEquivalentTo("/tmp/registry.file"))
-			os.Unsetenv("REGISTRY_AUTH_FILE")
 
-			// Fall back to DOCKER_CONFIG
+			// Given
+			t.Setenv("REGISTRY_AUTH_FILE", "")
+			// When
 			authFile = GetDefaultAuthFile()
 			// Then
 			gomega.Expect(authFile).To(gomega.BeEquivalentTo("/tmp/config.json"))
-			os.Unsetenv("DOCKER_CONFIG")
 
-			// Fall back to DOCKER_CONFIG
+			// Given
+			t.Setenv("DOCKER_CONFIG", "")
+			// When
 			authFile = GetDefaultAuthFile()
 			// Then
 			gomega.Expect(authFile).To(gomega.BeEquivalentTo(""))
-
-			// Undo that
-			if envSet {
-				os.Setenv("REGISTRY_AUTH_FILE", oldConf)
-			}
-			if envDockerSet {
-				os.Setenv("DOCKER_CONFIG", oldDockerConf)
-			}
 		})
 	})
 

Diff for: pkg/config/config_local_test.go

@@ -41,11 +41,8 @@ var _ = Describe("Config Local", func() {
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 		gomega.Expect(defConf).NotTo(gomega.BeNil())
 
-		validDirPath, err := os.MkdirTemp("", "config-empty")
-		if err != nil {
-			panic(err)
-		}
-		defer os.RemoveAll(validDirPath)
+		t := GinkgoT()
+		validDirPath := t.TempDir()
 
 		// Given
 		defConf.Network.NetworkConfigDir = validDirPath
@@ -63,11 +60,9 @@ var _ = Describe("Config Local", func() {
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 		gomega.Expect(defConf).NotTo(gomega.BeNil())
 
-		validDirPath, err := os.MkdirTemp("", "config-empty")
-		if err != nil {
-			panic(err)
-		}
-		defer os.RemoveAll(validDirPath)
+		t := GinkgoT()
+		validDirPath := t.TempDir()
+
 		// Given
 		defConf.Network.NetworkConfigDir = validDirPath
 		defConf.Network.CNIPluginDirs.Set([]string{validDirPath})
@@ -391,25 +386,19 @@ var _ = Describe("Config Local", func() {
 			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 		}
 		// Given we do
-		oldContainersConf, envSet := os.LookupEnv(containersConfEnv)
-		os.Setenv(containersConfEnv, "/dev/null")
+		t := GinkgoT()
+		t.Setenv(containersConfEnv, "/dev/null")
 
 		// When
 		config, err := Default()
 
-		// Undo that
-		if envSet {
-			os.Setenv(containersConfEnv, oldContainersConf)
-		} else {
-			os.Unsetenv(containersConfEnv)
-		}
 		// Then
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 		gomega.Expect(config.GetDefaultEnv()).To(gomega.BeEquivalentTo(envs))
 		config.Containers.HTTPProxy = true
 		gomega.Expect(config.GetDefaultEnv()).To(gomega.BeEquivalentTo(envs))
-		os.Setenv("HTTP_PROXY", "localhost")
-		os.Setenv("FOO", "BAR")
+		t.Setenv("HTTP_PROXY", "localhost")
+		t.Setenv("FOO", "BAR")
 		newenvs := []string{"HTTP_PROXY=localhost"}
 		envs = append(newenvs, envs...)
 		gomega.Expect(config.GetDefaultEnv()).To(gomega.BeEquivalentTo(envs))