From 200f86edea12ae45e064df94bc0fbe3728d06391 Mon Sep 17 00:00:00 2001 From: Toshiki Sonoda Date: Tue, 27 Dec 2022 18:20:42 +0900 Subject: [PATCH] e2e: fix containers_conf_test Prevents overwriting of TMPDIR environment. Signed-off-by: Toshiki Sonoda --- test/e2e/containers_conf_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 35d7e23774..8f53a665ed 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -419,6 +419,14 @@ var _ = Describe("Verify podman containers.conf usage", func() { }) It("add image_copy_tmp_dir", func() { + // Prevents overwriting of TMPDIR environment + if cacheDir, found := os.LookupEnv("TMPDIR"); found { + defer os.Setenv("TMPDIR", cacheDir) + os.Unsetenv("TMPDIR") + } else { + defer os.Unsetenv("TMPDIR") + } + session := podmanTest.Podman([]string{"info", "--format", "{{.Store.ImageCopyTmpDir}}"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) @@ -462,6 +470,13 @@ var _ = Describe("Verify podman containers.conf usage", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(125)) Expect(session.Err.Contents()).To(ContainSubstring("invalid image_copy_tmp_dir value \"storage1\" (relative paths are not accepted)")) + + os.Setenv("TMPDIR", "/hoge") + session = podmanTest.Podman([]string{"info", "--format", "{{.Store.ImageCopyTmpDir}}"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).To(Equal("/hoge")) + os.Unsetenv("TMPDIR") } })