From a7c522dfe7f3ab0b9e02f793742c6bba5000c712 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Wed, 29 Nov 2023 06:58:20 -0700
Subject: [PATCH] Gating test fixes

Two newly-added tests, fail in gating:
 - system connection: difference in how sockets are set up
   between CI and gating
 - ulimit: gating seems to run with ulimit -c -H 0. Check, and
   skip if ulimit is less than what we need

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/030-run.bats               |  3 +++
 test/system/272-system-connection.bats | 21 ++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index ab2abfa37b..511abf0919 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -1154,6 +1154,9 @@ EOF
     if is_rootless; then
         run ulimit -c -H
         max=$output
+        if [[ "$max" != "unlimited" ]] && [[ $max -lt 1000 ]]; then
+            skip "ulimit -c == $max, test requires >= 1000"
+        fi
     fi
 
     run_podman run --ulimit core=-1:-1 --rm $IMAGE grep core /proc/self/limits
diff --git a/test/system/272-system-connection.bats b/test/system/272-system-connection.bats
index d146d6cd5a..028bd4b0a1 100644
--- a/test/system/272-system-connection.bats
+++ b/test/system/272-system-connection.bats
@@ -187,6 +187,10 @@ $c2[ ]\+tcp://localhost:54321[ ]\+true" \
     #   3. ActiveService from containers.conf
     #   4. RemoteURI
 
+    # Prerequisite check: there must be no defined system connections
+    run_podman system connection ls -q
+    assert "$output" = "" "This test requires an empty list of system connections"
+
     # setup
     run_podman 0+w system connection add defaultconnection unix:///run/user/defaultconnection/podman/podman.sock
     run_podman 0+w system connection add env-override unix:///run/user/env-override/podman/podman.sock
@@ -232,9 +236,20 @@ $c2[ ]\+tcp://localhost:54321[ ]\+true" \
     run_podman system connection rm env-override
     run_podman system connection rm cli-override
 
-    _run_podman_remote 125 --remote ps
-    assert "$output" =~ "/run/[a-z0-9/]*podman/podman.sock"\
-        "test absence of default connection"
+    # With all system connections removed, test the default connection.
+    # This only works in upstream CI, where we run with a nonstandard socket.
+    # In gating we use the default /run/...
+    run_podman info --format '{{.Host.RemoteSocket.Path}}'
+    local sock="$output"
+    if [[ "$sock" =~ //run/ ]]; then
+        _run_podman_remote --remote info --format '{{.Host.RemoteSocket.Path}}'
+        assert "$output" = "$sock" "podman-remote is using default socket path"
+    else
+        # Nonstandard socket
+        _run_podman_remote 125 --remote ps
+        assert "$output" =~ "/run/[a-z0-9/]*podman/podman.sock"\
+               "test absence of default connection"
+    fi
 }
 
 # vim: filetype=sh