Merge pull request #14588 from edsantiago/eek_buildah_bud_coverage

buildah-bud tests: reenable skipped 'bud' tests

1 files changed, 12 insertions, 9 deletions

diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 0bde060ed..0b691dd0e 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -155,13 +155,7 @@ errmsg "checking authfile: stat /tmp/nonexistent: no such file or directory" \
 ###############################################################################
 # BEGIN tests that don't make sense under podman due to fundamental differences
 
-# TODO
-# Normally, when buildah exits 1 on error, podman exits 125.
-# These tests are the exception. They exit 1 under podman.
-skip "these tests exit 1 under podman, not 125" \
-     "bud with --add-host" \
-     "bud - invalid runtime flags test"
-
+# Fails with "Error: no context directory and no Containerfile specified"
 skip "does not work under podman" \
      "bud without any arguments should succeed"
 
@@ -172,8 +166,9 @@ skip "does not work under podman" \
 skip "FIXME FIXME FIXME: argument-order incompatible with podman" \
      "bud-squash-hardlinks"
 
-skip "FIXME FIXME FIXME: this passes on Ed's laptop, fails in CI??" \
-     "bud-multi-stage-nocache-nocommit"
+# Fails with "Error: context must be a directory: /path/to/Dockerfile"
+skip "podman-build fails with 'context must be a directory'" \
+     "bud with specified context should succeed if context contains existing Dockerfile"
 
 ###############################################################################
 # BEGIN tests which are skipped because they make no sense under podman-remote
@@ -240,4 +235,12 @@ skip_if_remote "FIXME FIXME FIXME: find a way to clean up their podman calls" \
                "bud with run should not leave mounts behind cleanup test" \
                "bud with custom files in /run/ should persist cleanup test"
 
+# Under podman-remote, the "Ignoring <stdin>:5:2: error: #error" message
+# is never seen. (Not even as stdout/stderr on the server; Ed checked).
+skip_if_remote "FIXME FIXME FIXME: 'Ignoring' warning is never seen" \
+               "bud with preprocessor error"
+
+# END   tests which are skipped due to actual podman or podman-remote bugs.
+###############################################################################
+
 exit $RC