From 8febb6aa11edf2d91b0e44743bb0b4dc253d9f44 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 17 Jul 2023 07:52:55 -0600
Subject: [PATCH] Emergency gating-test fixes for RHEL8

- the "podman {run,exec} /etc" test: runc now spits out
  "is a directory" instead of "permission denied". And,
  on exec, exits 255 instead of 126. Deal with it.

- workaround for https://github.com/containers/skopeo/issues/823
  (skopeo XDG bug): always make sure XDG is defined for skopeo

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/030-run.bats  |  4 +++-
 test/system/075-exec.bats |  9 +++++++--
 test/system/helpers.bash  | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 1ff81cdbe8..2b089f2573 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -7,7 +7,9 @@ load helpers.network
     rand=$(random_string 30)
 
     err_no_such_cmd="Error:.*/no/such/command.*[Nn]o such file or directory"
-    err_no_exec_dir="Error:.*exec.*permission denied"
+    # runc: RHEL8 on 2023-07-17: "is a directory".
+    # Everything else (crun; runc on debian): "permission denied"
+    err_no_exec_dir="Error:.*exec.*\\\(permission denied\\\|is a directory\\\)"
 
     tests="
 true              |   0 |
diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats
index 16bb8cb294..0823166acb 100644
--- a/test/system/075-exec.bats
+++ b/test/system/075-exec.bats
@@ -22,8 +22,13 @@ load helpers
 
     # Specially defined situations: exec a dir, or no such command.
     # We don't check the full error message because runc & crun differ.
-    run_podman 126 exec $cid /etc
-    is "$output" ".*permission denied"  "podman exec /etc"
+    #
+    # UPDATE 2023-07-17 runc on RHEL8 (but not Debian) now says "is a dir"
+    # and exits 255 instead of 126 as it does everywhere else.
+    run_podman '?' exec $cid /etc
+    is "$output" ".*\(permission denied\|is a directory\)"  \
+       "podman exec /etc"
+    assert "$status" -ne 0 "exit status from 'exec /etc'"
     run_podman 127 exec $cid /no/such/command
     is "$output" ".*such file or dir"   "podman exec /no/such/command"
 
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 21ecd4a6d1..0cd505846a 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -110,6 +110,21 @@ function _prefetch() {
     $cmd
 }
 
+
+# Wrapper for skopeo, because skopeo doesn't work rootless if $XDG is unset
+# (as it is in RHEL gating): it defaults to /run/containers/<uid>, which
+# of course is a root-only dir, hence fails with permission denied.
+# -- https://github.com/containers/skopeo/issues/823
+function skopeo() {
+    local xdg=${XDG_RUNTIME_DIR}
+    if [ -z "$xdg" ]; then
+        if is_rootless; then
+            xdg=/run/user/$(id -u)
+        fi
+    fi
+    XDG_RUNTIME_DIR=${xdg} command skopeo "$@"
+}
+
 # END   tools for fetching & caching test images
 ###############################################################################
 # BEGIN setup/teardown tools