summaryrefslogtreecommitdiff
path: root/test/buildah-bud/apply-podman-deltas
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-05 15:40:19 -0400
committerGitHub <noreply@github.com>2022-05-05 15:40:19 -0400
commit83ef2c721ad438256b136b3491e504a6e70b64c9 (patch)
treef6de5a7db4fb79801d607eb4c1fb0c1553341b90 /test/buildah-bud/apply-podman-deltas
parent8081d921b2bf39a418155a6822e55f3392ad63f6 (diff)
parentd57bbdb5cd24966a4a6f01dbdea6b17a6ef2965b (diff)
downloadpodman-83ef2c721ad438256b136b3491e504a6e70b64c9.tar.gz
podman-83ef2c721ad438256b136b3491e504a6e70b64c9.tar.bz2
podman-83ef2c721ad438256b136b3491e504a6e70b64c9.zip
Merge pull request #14127 from rhatdan/v4.1
Vendor in containers/buildah@v1.26.1
Diffstat (limited to 'test/buildah-bud/apply-podman-deltas')
-rwxr-xr-xtest/buildah-bud/apply-podman-deltas22
1 files changed, 22 insertions, 0 deletions
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 66e8687de..1ca171c4a 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -134,6 +134,19 @@ errmsg "no such file or directory" \
"context must be a directory" \
"bud with specified context should fail if context contains not-existing Dockerfile"
+# 2022-04-26 after buildah PR 3926 (where Ed added error-message checks"
+errmsg "no FROM statement found" \
+ "Error: no FROM statement found" \
+ "bud with Dockerfile from invalid URL"
+
+errmsg "no contents in .*" \
+ "Error: context must be a directory: .*" \
+ "bud with specified context should fail if context contains empty Dockerfile"
+
+errmsg "checking authfile: stat /tmp/nonexistent: no such file or directory" \
+ "Error: checking authfile: stat /tmp/nonexistent: no such file or directory" \
+ "bud with Containerfile should fail with nonexistent authfile"
+
###############################################################################
# BEGIN tests that don't make sense under podman due to fundamental differences
@@ -188,6 +201,15 @@ skip_if_remote "local keyfile not sent to podman-remote" \
skip_if_remote "--stdin option will not be implemented in podman-remote" \
"bud test no --stdin"
+# https://github.com/containers/buildah/pull/3823
+# If this is possible with podman-remote, it'll take way more Go skills
+# to implement than what Ed can do.
+skip_if_remote "--output option not implemented in podman-remote" \
+ "build with custom build output and output rootfs to directory" \
+ "build with custom build output and output rootfs to tar" \
+ "build with custom build output and output rootfs to tar by pipe" \
+ "build with custom build output must fail for bad input"
+
###############################################################################
# BEGIN tests which are skipped due to actual podman or podman-remote bugs.