diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-01-12 14:48:37 -0700 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-01-13 16:24:13 +0100 |
| commit | ece768ff9e7d2b0166c0b1850467a489556b93fc (patch) | |
| tree | d14bdd03093dd83a03cd34f615957b07d9656a1f /test/buildah-bud/buildah-tests.diff | |
| parent | 92e7875210d3f6a52b3ef43e8a249022aba5a07c (diff) | |
| download | podman-ece768ff9e7d2b0166c0b1850467a489556b93fc.tar.gz podman-ece768ff9e7d2b0166c0b1850467a489556b93fc.tar.bz2 podman-ece768ff9e7d2b0166c0b1850467a489556b93fc.zip | |
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>
Diffstat (limited to 'test/buildah-bud/buildah-tests.diff')
| -rw-r--r-- | test/buildah-bud/buildah-tests.diff | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index cbbfdb662..b1a19a522 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -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> Date: Tue, 9 Feb 2021 17:28:05 -0700 Subject: [PATCH] tweaks for running buildah tests under podman Signed-off-by: Ed Santiago <santiago@redhat.com> --- - tests/helpers.bash | 71 +++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 67 insertions(+), 4 deletions(-) + tests/helpers.bash | 72 +++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/tests/helpers.bash b/tests/helpers.bash -index bd2794c9..c337a1d5 100644 +index bd2794c9..ecf6ed7d 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash @@ -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 esac @@ -86,9 +86,10 @@ index bd2794c9..c337a1d5 100644 + _opts= + 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 -+ 1|2) expected_rc=125 ;; ++ 1|2|128) expected_rc=125 ;; + esac + fi + local cmd_basename=$(basename ${podman_or_buildah}) @@ -108,7 +109,7 @@ index bd2794c9..c337a1d5 100644 # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" -@@ -499,6 +553,15 @@ function skip_if_no_docker() { +@@ -499,6 +554,15 @@ function skip_if_no_docker() { fi } |