From f6584e443a738938d73d58cd6f2079b053f7f5fb Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Thu, 14 Aug 2025 15:11:30 -0400 Subject: [PATCH] [v5.6] Reverse skipped test for 26773 An issue was found late in Podman v5.6 RC2 and it was reported in #26773. The failing test was changed so that it was skipped. This commit renables that test as the fix should be contained in Buildah 1.41.3. Signed-off-by: tomsweeneyredhat --- test/buildah-bud/apply-podman-deltas | 5 -- test/e2e/diff_test.go | 85 +++++++++++++--------------- 2 files changed, 40 insertions(+), 50 deletions(-) diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index d03dd70914..508c4ad38b 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -330,11 +330,6 @@ skip "FIXME: 2024-05-28 new VMs from #338" \ skip_if_remote "FIXME: 2025-04-01 git related errors returning wrong exit code" \ "bud with ADD with git repository source" -# 2025-08-07 test needs to be fixed in buildah repo, unknown issue, fixing to get v5.6 RC2 out -# https://github.com/containers/podman/issues/26773 -skip "FIXME: 2025-08-07 Buildah v1.41.1 vendor into Podman for v5.6 RC2" \ - "bud should include excluded pulled up parent directories in squashed images" - # END temporary workarounds that must be reevaluated periodically ############################################################################### diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 142f3b9029..9d8d2b3284 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -104,11 +104,10 @@ RUN echo test session = podmanTest.Podman([]string{"image", "diff", image, baseImage}) session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly()) - // Comment out https://github.com/containers/podman/issues/26680. - // Expect(session.OutputToStringArray()).To(HaveLen(4)) - // Expect(session.OutputToString()).To(ContainSubstring("A " + file1)) - // Expect(session.OutputToString()).To(ContainSubstring("A " + file2)) - // Expect(session.OutputToString()).To(ContainSubstring("A " + file3)) + Expect(session.OutputToStringArray()).To(HaveLen(3)) + Expect(session.OutputToString()).To(ContainSubstring("A " + file1)) + Expect(session.OutputToString()).To(ContainSubstring("A " + file2)) + Expect(session.OutputToString()).To(ContainSubstring("A " + file3)) }) It("podman image diff of single image", func() { @@ -131,46 +130,42 @@ RUN echo test Expect(session.OutputToStringArray()).To(BeEmpty()) }) - // Commented out on July 23, 2025 to avoid issue noted in - // https://github.com/containers/podman/issues/26680. Uncomment - // once that is addressed. - // - // It("podman diff container and image with same name", func() { - // imagefile := "/" + stringid.GenerateRandomID() - // confile := "/" + stringid.GenerateRandomID() - // - // // Create container image with the files - // containerfile := fmt.Sprintf(` - // FROM %s - // RUN touch %s`, ALPINE, imagefile) - // - // name := "podman-diff-test" - // podmanTest.BuildImage(containerfile, name, "false") - // - // session := podmanTest.Podman([]string{"run", "--name", name, ALPINE, "touch", confile}) - // session.WaitWithDefaultTimeout() - // Expect(session).Should(ExitCleanly()) - // - // // podman diff prefers image over container when they have the same name - // session = podmanTest.Podman([]string{"diff", name}) - // session.WaitWithDefaultTimeout() - // Expect(session).Should(ExitCleanly()) - // Expect(session.OutputToStringArray()).To(HaveLen(1)) - // Expect(session.OutputToString()).To(ContainSubstring(imagefile)) - // - // session = podmanTest.Podman([]string{"image", "diff", name}) - // session.WaitWithDefaultTimeout() - // Expect(session).Should(ExitCleanly()) - // Expect(session.OutputToStringArray()).To(HaveLen(1)) - // Expect(session.OutputToString()).To(ContainSubstring(imagefile)) - // - // // container diff has to show the container - // session = podmanTest.Podman([]string{"container", "diff", name}) - // session.WaitWithDefaultTimeout() - // Expect(session).Should(ExitCleanly()) - // Expect(session.OutputToStringArray()).To(HaveLen(2)) - // Expect(session.OutputToString()).To(ContainSubstring(confile)) - // }) + It("podman diff container and image with same name", func() { + imagefile := "/" + stringid.GenerateRandomID() + confile := "/" + stringid.GenerateRandomID() + + // Create container image with the files + containerfile := fmt.Sprintf(` + FROM %s + RUN touch %s`, ALPINE, imagefile) + + name := "podman-diff-test" + podmanTest.BuildImage(containerfile, name, "false") + + session := podmanTest.Podman([]string{"run", "--name", name, ALPINE, "touch", confile}) + session.WaitWithDefaultTimeout() + Expect(session).Should(ExitCleanly()) + + // podman diff prefers image over container when they have the same name + session = podmanTest.Podman([]string{"diff", name}) + session.WaitWithDefaultTimeout() + Expect(session).Should(ExitCleanly()) + Expect(session.OutputToStringArray()).To(HaveLen(1)) + Expect(session.OutputToString()).To(ContainSubstring(imagefile)) + + session = podmanTest.Podman([]string{"image", "diff", name}) + session.WaitWithDefaultTimeout() + Expect(session).Should(ExitCleanly()) + Expect(session.OutputToStringArray()).To(HaveLen(1)) + Expect(session.OutputToString()).To(ContainSubstring(imagefile)) + + // container diff has to show the container + session = podmanTest.Podman([]string{"container", "diff", name}) + session.WaitWithDefaultTimeout() + Expect(session).Should(ExitCleanly()) + Expect(session.OutputToStringArray()).To(HaveLen(2)) + Expect(session.OutputToString()).To(ContainSubstring(confile)) + }) It("podman diff without args", func() { session := podmanTest.Podman([]string{"diff"})