containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual fixes for PR #12642: 

- reenable git:// tests
 - git command fails with (EVIL) status 128. Deal with it.
 - skip a bunch more podman-remote tests. Filed an issue for
   one of them (#12838), the others may not be fixable.

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Ed Santiago 2022-01-12 14:48:37 -07:00 committed by Paul Holzinger
parent 92e7875210
commit ece768ff9e
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ function skip_if_remote() {
############################################################################### ###############################################################################
# BEGIN differences in error messages between buildah and podman # BEGIN differences in error messages between buildah and podman
errmsg "non-directory/Dockerfile: not a directory" \ errmsg "non-directory/Dockerfile: not a directory" \
"Error: context must be a directory:" \ "Error: context must be a directory:" \
"bud with a path to a Dockerfile (-f) containing a non-directory entry" "bud with a path to a Dockerfile (-f) containing a non-directory entry"
@ -177,7 +178,9 @@ skip_if_remote "--runtime not meaningful under podman-remote" \
skip_if_remote "secret files not implemented under podman-remote" \ skip_if_remote "secret files not implemented under podman-remote" \
"bud with containerfile secret" \ "bud with containerfile secret" \
"bud with containerfile secret accessed on second RUN" \ "bud with containerfile secret accessed on second RUN" \
"bud with containerfile secret options" "bud with containerfile secret options" \
"bud with containerfile env secret" \
"bud with containerfile env secret priority"
skip_if_remote "volumes don't work with podman-remote" \ skip_if_remote "volumes don't work with podman-remote" \
"buildah bud --volume" \ "buildah bud --volume" \
@ -188,18 +191,20 @@ skip_if_remote "--stdin option will not be implemented in podman-remote" \
"bud test no --stdin" "bud test no --stdin"
############################################################################### ###############################################################################
# BEGIN tests which are skipped due to actual podman-remote bugs. # BEGIN tests which are skipped due to actual podman or podman-remote bugs.
############################################################################### skip_if_remote "Podman #12838: different error messages" \
# BEGIN emergency handling of github git-protocol shutdown "bud with .dockerignore #2"
#
# Please remove this as soon as we vendor buildah with #3701
skip "emergency workaround until buildah #3701 gets vendored in" \ # These two tests, new in 2022-01, invoke podman (create, export) in ways
"bud-git-context" \ # that don't work with podman-remote due to the use of --registries-conf
"bud using gitrepo and branch" 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"
skip_if_remote "Do envariables work with -remote? Please look into this." \
"build proxy"
# END emergency handling of github git-protocol shutdown
############################################################################### ###############################################################################
# Done. # Done.

17
test/buildah-bud/buildah-tests.diff
View File

@ -1,15 +1,15 @@
From 522a0a799bbe5e5ddd4b92507e30ea47b93252f4 Mon Sep 17 00:00:00 2001 From c18638abfbc1066442cf6ff0b3f012a5c25a918e Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com> From: Ed Santiago <santiago@redhat.com>
Date: Tue, 9 Feb 2021 17:28:05 -0700 Date: Tue, 9 Feb 2021 17:28:05 -0700
Subject: [PATCH] tweaks for running buildah tests under podman Subject: [PATCH] tweaks for running buildah tests under podman
Signed-off-by: Ed Santiago <santiago@redhat.com> Signed-off-by: Ed Santiago <santiago@redhat.com>
--- ---
tests/helpers.bash | 71 +++++++++++++++++++++++++++++++++++++++++++--- tests/helpers.bash | 72 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 67 insertions(+), 4 deletions(-) 1 file changed, 68 insertions(+), 4 deletions(-)
diff --git a/tests/helpers.bash b/tests/helpers.bash diff --git a/tests/helpers.bash b/tests/helpers.bash
index bd2794c9..c337a1d5 100644 index bd2794c9..ecf6ed7d 100644
--- a/tests/helpers.bash --- a/tests/helpers.bash
+++ b/tests/helpers.bash +++ b/tests/helpers.bash
@@ -43,6 +43,23 @@ EOF @@ -43,6 +43,23 @@ EOF
@ -64,7 +64,7 @@ index bd2794c9..c337a1d5 100644
} }
################# #################
@@ -192,15 +221,40 @@ function run_buildah() { @@ -192,15 +221,41 @@ function run_buildah() {
--retry) retry=3; shift;; # retry network flakes --retry) retry=3; shift;; # retry network flakes
esac esac
@ -86,9 +86,10 @@ index bd2794c9..c337a1d5 100644
+ _opts= + _opts=
+ fi + fi
+ +
+ # podman always exits 125 where buildah exits 1 or 2 + # podman always exits 125 where buildah exits 1 or 2 (or, in the
+ # case of git, 128, which is a bug in git, but I won't harp on that).
+ case $expected_rc in + case $expected_rc in
+ 1|2) expected_rc=125 ;; + 1|2|128) expected_rc=125 ;;
+ esac + esac
+ fi + fi
+ local cmd_basename=$(basename ${podman_or_buildah}) + local cmd_basename=$(basename ${podman_or_buildah})
@ -108,7 +109,7 @@ index bd2794c9..c337a1d5 100644
# without "quotes", multiple lines are glommed together into one # without "quotes", multiple lines are glommed together into one
if [ -n "$output" ]; then if [ -n "$output" ]; then
echo "$output" echo "$output"
@@ -499,6 +553,15 @@ function skip_if_no_docker() { @@ -499,6 +554,15 @@ function skip_if_no_docker() {
fi fi
} }