opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix buildah-bud test diff

Browse Source 
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-01-12 20:32:17 +01:00
parent 85f9cf3903
commit b24063582d
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 5baab334cac9853c1d4bae9466d46dbbe5ff7158 Mon Sep 17 00:00:00 2001 From 522a0a799bbe5e5ddd4b92507e30ea47b93252f4 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
@ -9,7 +9,7 @@ Signed-off-by: Ed Santiago <santiago@redhat.com>
1 file changed, 67 insertions(+), 4 deletions(-) 1 file changed, 67 insertions(+), 4 deletions(-)
diff --git a/tests/helpers.bash b/tests/helpers.bash diff --git a/tests/helpers.bash b/tests/helpers.bash
index 166316d5..775d7c9b 100644 index bd2794c9..c337a1d5 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
@ -36,9 +36,9 @@ index 166316d5..775d7c9b 100644
} }
function starthttpd() { function starthttpd() {
@@ -84,6 +101,12 @@ function teardown(){ @@ -85,6 +102,12 @@ function teardown_tests() {
function teardown_tests() {
stophttpd stophttpd
stop_git_daemon
+ if [[ -n "$PODMAN_SERVER_PID" ]]; then + if [[ -n "$PODMAN_SERVER_PID" ]]; then
+ kill $PODMAN_SERVER_PID + kill $PODMAN_SERVER_PID
@ -49,7 +49,7 @@ index 166316d5..775d7c9b 100644
# Workaround for #1991 - buildah + overlayfs leaks mount points. # Workaround for #1991 - buildah + overlayfs leaks mount points.
# Many tests leave behind /var/tmp/.../root/overlay and sub-mounts; # Many tests leave behind /var/tmp/.../root/overlay and sub-mounts;
# let's find those and clean them up, otherwise 'rm -rf' fails. # let's find those and clean them up, otherwise 'rm -rf' fails.
@@ -156,7 +179,13 @@ function copy() { @@ -157,7 +180,13 @@ function copy() {
} }
function podman() { function podman() {
@ -64,7 +64,7 @@ index 166316d5..775d7c9b 100644
} }
################# #################
@@ -191,15 +220,40 @@ function run_buildah() { @@ -192,15 +221,40 @@ function run_buildah() {
--retry) retry=3; shift;; # retry network flakes --retry) retry=3; shift;; # retry network flakes
esac esac
@ -108,11 +108,10 @@ index 166316d5..775d7c9b 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"
@@ -477,3 +531,12 @@ function skip_if_no_docker() { @@ -499,6 +553,15 @@ function skip_if_no_docker() {
skip "this test needs actual docker, not podman-docker"
fi fi
} }
+
+#################### +####################
+# skip_if_remote # (only applicable for podman) +# skip_if_remote # (only applicable for podman)
+#################### +####################
@ -121,6 +120,10 @@ index 166316d5..775d7c9b 100644
+ skip "${1:-test does not work with podman-remote}" + skip "${1:-test does not work with podman-remote}"
+ fi + fi
+} +}
+
function start_git_daemon() {
daemondir=${TESTDIR}/git-daemon
mkdir -p ${daemondir}/repo
-- --
2.25.1 2.34.1