pkg/config: fix verify getDefaultEnv test flake

Do not use Default() in unit tests, that caches the config in a global
var so it conflicts with other tests also calling it.

Now only the Reload test should test that. The Default() call got broken
by commit ee04b4f because now the test only unsets the env after the
last Reload() call which should already use the actual default.

Fixes: ee04b4f ("*_test.go: use t.TempDir, t.Setenv")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

Author: Luap99

pkg/config/config_local_test.go

@@ -390,7 +390,7 @@ var _ = Describe("Config Local", func() {
 		t.Setenv(containersConfEnv, "/dev/null")
 
 		// When
-		config, err := Default()
+		config, err := New(nil)
 
 		// Then
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())

pkg/config/config_test.go

@@ -748,7 +748,15 @@ image_copy_tmp_dir="storage"`
 			t := GinkgoT()
 			// Default configuration
 			defaultTestFile := "testdata/containers_default.conf"
+			// Note this must be defined before the Setenv as cleanup happens LIFO
+			// and Reload() must be called without the custom env to reset the default config
+			DeferCleanup(func() {
+				// Reload change back to default global configuration
+				_, err := Reload()
+				gomega.Expect(err).ToNot(gomega.HaveOccurred())
+			})
 			t.Setenv(containersConfEnv, defaultTestFile)
+
 			cfg, err := Default()
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
@@ -768,9 +776,6 @@ env=["foo=bar"]`
 			expectNewEnv := []string{"foo=bar"}
 			gomega.Expect(cfg.Containers.Env.Get()).To(gomega.Equal(expectOldEnv))
 			gomega.Expect(newCfg.Containers.Env.Get()).To(gomega.Equal(expectNewEnv))
-			// Reload change back to default global configuration
-			_, err = Reload()
-			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 		})
 	})