opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-09 15:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[v5.6] Reverse skipped test for 26773

Browse Source 
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 <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2025-08-14 15:11:30 -04:00
parent ab7c7cbc57
commit f6584e443a
2 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/buildah-bud/apply-podman-deltas
View File

@@ -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" \ skip_if_remote "FIXME: 2025-04-01 git related errors returning wrong exit code" \
"bud with ADD with git repository source" "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 # END temporary workarounds that must be reevaluated periodically
############################################################################### ###############################################################################

85
test/e2e/diff_test.go
View File

@@ -104,11 +104,10 @@ RUN echo test
session = podmanTest.Podman([]string{"image", "diff", image, baseImage}) session = podmanTest.Podman([]string{"image", "diff", image, baseImage})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
// Comment out https://github.com/containers/podman/issues/26680. Expect(session.OutputToStringArray()).To(HaveLen(3))
// Expect(session.OutputToStringArray()).To(HaveLen(4)) Expect(session.OutputToString()).To(ContainSubstring("A " + file1))
// Expect(session.OutputToString()).To(ContainSubstring("A " + file1)) Expect(session.OutputToString()).To(ContainSubstring("A " + file2))
// Expect(session.OutputToString()).To(ContainSubstring("A " + file2)) Expect(session.OutputToString()).To(ContainSubstring("A " + file3))
// Expect(session.OutputToString()).To(ContainSubstring("A " + file3))
}) })
It("podman image diff of single image", func() { It("podman image diff of single image", func() {
@@ -131,46 +130,42 @@ RUN echo test
Expect(session.OutputToStringArray()).To(BeEmpty()) Expect(session.OutputToStringArray()).To(BeEmpty())
}) })
// Commented out on July 23, 2025 to avoid issue noted in It("podman diff container and image with same name", func() {
// https://github.com/containers/podman/issues/26680. Uncomment imagefile := "/" + stringid.GenerateRandomID()
// once that is addressed. confile := "/" + stringid.GenerateRandomID()
//
// It("podman diff container and image with same name", func() { // Create container image with the files
// imagefile := "/" + stringid.GenerateRandomID() containerfile := fmt.Sprintf(`
// confile := "/" + stringid.GenerateRandomID() FROM %s
// RUN touch %s`, ALPINE, imagefile)
// // Create container image with the files
// containerfile := fmt.Sprintf(` name := "podman-diff-test"
// FROM %s podmanTest.BuildImage(containerfile, name, "false")
// RUN touch %s`, ALPINE, imagefile)
// session := podmanTest.Podman([]string{"run", "--name", name, ALPINE, "touch", confile})
// name := "podman-diff-test" session.WaitWithDefaultTimeout()
// podmanTest.BuildImage(containerfile, name, "false") Expect(session).Should(ExitCleanly())
//
// session := podmanTest.Podman([]string{"run", "--name", name, ALPINE, "touch", confile}) // podman diff prefers image over container when they have the same name
// session.WaitWithDefaultTimeout() session = podmanTest.Podman([]string{"diff", name})
// Expect(session).Should(ExitCleanly()) session.WaitWithDefaultTimeout()
// Expect(session).Should(ExitCleanly())
// // podman diff prefers image over container when they have the same name Expect(session.OutputToStringArray()).To(HaveLen(1))
// session = podmanTest.Podman([]string{"diff", name}) Expect(session.OutputToString()).To(ContainSubstring(imagefile))
// session.WaitWithDefaultTimeout()
// Expect(session).Should(ExitCleanly()) session = podmanTest.Podman([]string{"image", "diff", name})
// Expect(session.OutputToStringArray()).To(HaveLen(1)) session.WaitWithDefaultTimeout()
// Expect(session.OutputToString()).To(ContainSubstring(imagefile)) Expect(session).Should(ExitCleanly())
// Expect(session.OutputToStringArray()).To(HaveLen(1))
// session = podmanTest.Podman([]string{"image", "diff", name}) Expect(session.OutputToString()).To(ContainSubstring(imagefile))
// session.WaitWithDefaultTimeout()
// Expect(session).Should(ExitCleanly()) // container diff has to show the container
// Expect(session.OutputToStringArray()).To(HaveLen(1)) session = podmanTest.Podman([]string{"container", "diff", name})
// Expect(session.OutputToString()).To(ContainSubstring(imagefile)) session.WaitWithDefaultTimeout()
// Expect(session).Should(ExitCleanly())
// // container diff has to show the container Expect(session.OutputToStringArray()).To(HaveLen(2))
// session = podmanTest.Podman([]string{"container", "diff", name}) Expect(session.OutputToString()).To(ContainSubstring(confile))
// session.WaitWithDefaultTimeout() })
// Expect(session).Should(ExitCleanly())
// Expect(session.OutputToStringArray()).To(HaveLen(2))
// Expect(session.OutputToString()).To(ContainSubstring(confile))
// })
It("podman diff without args", func() { It("podman diff without args", func() {
session := podmanTest.Podman([]string{"diff"}) session := podmanTest.Podman([]string{"diff"})