From f37088f628e853d1d7958264169887868d9ac75f Mon Sep 17 00:00:00 2001 From: akalenyu <51477153+akalenyu@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:46:26 +0200 Subject: [PATCH] Use real tmpdir path in qemu blank image unit tests (#2596) Signed-off-by: Alex Kalenyuk --- pkg/image/qemu_test.go | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkg/image/qemu_test.go b/pkg/image/qemu_test.go index 7fd642b553..a0bd45a08b 100644 --- a/pkg/image/qemu_test.go +++ b/pkg/image/qemu_test.go @@ -295,13 +295,28 @@ var _ = Describe("quantity to qemu", func() { }) var _ = Describe("Create blank image", func() { + var tmpDir, destPath string + + BeforeEach(func() { + tmpDir, err := os.MkdirTemp(os.TempDir(), "qemutestdest") + Expect(err).NotTo(HaveOccurred()) + By("tmpDir: " + tmpDir) + destPath = filepath.Join(tmpDir, "dest") + _, err = os.Create(destPath) + Expect(err).NotTo(HaveOccurred()) + }) + + AfterEach(func() { + os.RemoveAll(tmpDir) + }) + It("Should complete successfully if qemu-img resize succeeds", func() { quantity, err := resource.ParseQuantity("10Gi") Expect(err).NotTo(HaveOccurred()) size := convertQuantityToQemuSize(quantity) - replaceExecFunction(mockExecFunction("", "", nil, "create", "-f", "raw", "image", size), func() { - err = CreateBlankImage("image", quantity, false) - Expect(err.Error()).To(ContainSubstring("no such file or directory")) + replaceExecFunction(mockExecFunction("", "", nil, "create", "-f", "raw", destPath, size), func() { + err = CreateBlankImage(destPath, quantity, false) + Expect(err).ToNot(HaveOccurred()) }) }) @@ -309,8 +324,8 @@ var _ = Describe("Create blank image", func() { quantity, err := resource.ParseQuantity("10Gi") Expect(err).NotTo(HaveOccurred()) size := convertQuantityToQemuSize(quantity) - replaceExecFunction(mockExecFunction("", "exit 1", nil, "create", "-f", "raw", "image", size), func() { - err = CreateBlankImage("image", quantity, false) + replaceExecFunction(mockExecFunction("", "exit 1", nil, "create", "-f", "raw", destPath, size), func() { + err = CreateBlankImage(destPath, quantity, false) Expect(err).To(HaveOccurred()) Expect(strings.Contains(err.Error(), "could not create raw image with size ")).To(BeTrue()) }) @@ -320,9 +335,9 @@ var _ = Describe("Create blank image", func() { quantity, err := resource.ParseQuantity("10Gi") Expect(err).NotTo(HaveOccurred()) size := convertQuantityToQemuSize(quantity) - replaceExecFunction(mockExecFunctionStrict("", "", nil, "create", "-f", "raw", "image", size, "-o", "preallocation=falloc"), func() { - err = CreateBlankImage("image", quantity, true) - Expect(err.Error()).To(ContainSubstring("no such file or directory")) + replaceExecFunction(mockExecFunctionStrict("", "", nil, "create", "-f", "raw", destPath, size, "-o", "preallocation=falloc"), func() { + err = CreateBlankImage(destPath, quantity, true) + Expect(err).ToNot(HaveOccurred()) }) }) @@ -330,9 +345,9 @@ var _ = Describe("Create blank image", func() { quantity, err := resource.ParseQuantity("10Gi") Expect(err).NotTo(HaveOccurred()) size := convertQuantityToQemuSize(quantity) - replaceExecFunction(mockExecFunctionStrict("", "", nil, "create", "-f", "raw", "image", size), func() { - err = CreateBlankImage("image", quantity, false) - Expect(err.Error()).To(ContainSubstring("no such file or directory")) + replaceExecFunction(mockExecFunctionStrict("", "", nil, "create", "-f", "raw", destPath, size), func() { + err = CreateBlankImage(destPath, quantity, false) + Expect(err).ToNot(HaveOccurred()) }) }) })