test/buildah-bud: update buildah-tests.diff

The buildah test code chnages so I had to manually resolve the conflict.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

test/buildah-bud/buildah-tests.diff

@@ -1,4 +1,4 @@
-From 09a0ad17630b688e0f06e3de83b830b70f6c50fc Mon Sep 17 00:00:00 2001
+From 814de89af4706b9767b457fd74b9f66f592e7afa Mon Sep 17 00:00:00 2001
 From: Ed Santiago <santiago@redhat.com>
 Date: Thu, 6 Oct 2022 17:32:59 -0600
 Subject: [PATCH] tweaks for running buildah tests under podman
@@ -10,10 +10,10 @@ Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  1 file changed, 109 insertions(+), 4 deletions(-)
 
 diff --git a/tests/helpers.bash b/tests/helpers.bash
-index ed5de994e..3fc39e17b 100644
+index 3d1211492..dbf175de3 100644
 --- a/tests/helpers.bash
 +++ b/tests/helpers.bash
-@@ -80,6 +80,42 @@ EOF
+@@ -81,6 +81,42 @@ EOF
      BUILDAH_REGISTRY_OPTS="${regconfopt} ${regconfdir} --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf"
      COPY_REGISTRY_OPTS="${BUILDAH_REGISTRY_OPTS}"
      PODMAN_REGISTRY_OPTS="${regconfopt}"
@@ -56,7 +56,7 @@ index ed5de994e..3fc39e17b 100644
  }
  
  function starthttpd() { # directory [working-directory-or-"" [certfile, keyfile]]
-@@ -144,6 +180,22 @@ function teardown_tests() {
+@@ -145,6 +181,22 @@ function teardown_tests() {
      stop_git_daemon
      stop_registry
  
@@ -79,7 +79,7 @@ index ed5de994e..3fc39e17b 100644
      # Workaround for #1991 - buildah + overlayfs leaks mount points.
      # Many tests leave behind /var/tmp/.../root/overlay and sub-mounts;
      # let's find those and clean them up, otherwise 'rm -rf' fails.
-@@ -265,7 +317,12 @@ function copy() {
+@@ -266,7 +318,12 @@ function copy() {
  }
  
  function podman() {
@@ -93,7 +93,7 @@ index ed5de994e..3fc39e17b 100644
  }
  
  # There are various scenarios where we would like to execute `tests` as rootless user, however certain commands like `buildah mount`
-@@ -329,8 +386,36 @@ function run_buildah() {
+@@ -373,8 +430,36 @@ function run_buildah() {
          --retry)         retry=3;        shift;;  # retry network flakes
      esac
  
@@ -131,7 +131,7 @@ index ed5de994e..3fc39e17b 100644
  
      # If session is rootless and `buildah mount` is invoked, perform unshare,
      # since normal user cannot mount a filesystem unless they're in a user namespace along with its own mount namespace.
-@@ -344,8 +429,8 @@ function run_buildah() {
+@@ -388,8 +473,8 @@ function run_buildah() {
          retry=$(( retry - 1 ))
  
          # stdout is only emitted upon error; this echo is to help a debugger
@@ -142,7 +142,7 @@ index ed5de994e..3fc39e17b 100644
          # without "quotes", multiple lines are glommed together into one
          if [ -n "$output" ]; then
              echo "$output"
-@@ -706,6 +791,26 @@ function skip_if_no_unshare() {
+@@ -753,6 +838,26 @@ function skip_if_no_unshare() {
    fi
  }
  
@@ -166,9 +166,9 @@ index ed5de994e..3fc39e17b 100644
 +    fi
 +}
 +
- function start_git_daemon() {
-   daemondir=${TEST_SCRATCH_DIR}/git-daemon
-   mkdir -p ${daemondir}/repo
+ ######################
+ #  start_git_daemon  #
+ ######################
 -- 
-2.48.1
+2.49.0