Merge pull request #27472 from Luap99/test-fixes

various different test fixes

Author: openshift-merge-bot[bot]

hack/bats

@@ -12,7 +12,7 @@ $0 is a wrapper for invoking podman system tests.
 
    --root         Run only as root
    --rootless     Run only as user (i.e. you)
-   --remote       Run with podman-remote (see below)
+   --remote       Run with podman-remote
 
    FILENAME-PATTERN Run only test files that match 'test/system/*name*',
                     e.g. '500' or 'net' will match 500-networking.bats.
@@ -36,16 +36,6 @@ By default, tests ./bin/podman. To test a different podman, do:
 
     \$ env PODMAN=/abs/path/to/podman $0 ....
 
-To test podman-remote, start your own servers (root and rootless) via:
-
-    \$ bin/podman system service --timeout=0 &
-    \$ sudo !!
-
-...then invoke this script with --remote. (This script can't start the
-servers, because we can sudo *starting* the service but can't sudo
-stopping it: by the time the bats tests finish, the sudo timeout will
-have expired. We apologize for the inconvenience.)
-
 Examples:
 
     \$ $0 220:\"restart cleans up\"
@@ -113,13 +103,7 @@ if [[ "$REMOTE" ]]; then
     if ! [[ $PODMAN =~ -remote ]]; then
         PODMAN=${PODMAN}-remote
     fi
-
-    if [[ -n "$TEST_ROOT" ]]; then
-        sudo $PODMAN info >/dev/null || exit 1
-    fi
-    if [[ -n "$TEST_ROOTLESS" ]]; then
-        $PODMAN info >/dev/null || exit 1
-    fi
+    export REMOTESYSTEM_TRANSPORT=unix
 fi
 
 # END   initialization and command-line arg checking

test/e2e/prune_test.go

@@ -12,6 +12,7 @@ import (
 	. "github.com/containers/podman/v6/test/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
 )
 
 var pruneImage = fmt.Sprintf(`
@@ -601,7 +602,7 @@ var _ = Describe("Podman prune", func() {
 		err := os.WriteFile(containerFilePath, []byte(longBuildImage), 0o755)
 		Expect(err).ToNot(HaveOccurred())
 
-		build := podmanTest.Podman([]string{"build", "-f", containerFilePath, "-t", "podmanleaker"})
+		build := podmanTest.Podman([]string{"build", "--network=none", "-f", containerFilePath, "-t", "podmanleaker"})
 		// Build will never finish so let's wait for build to ask for SIGKILL to simulate a failed build that leaves stage containers.
 		matchedOutput := false
 		for range 900 {
@@ -616,6 +617,10 @@ var _ = Describe("Podman prune", func() {
 			Fail("Did not match special string in podman build")
 		}
 
+		// kill is async, wait for process exit here and make sure it was killed (137).
+		build.WaitWithDefaultTimeout()
+		Expect(build).To(Exit(137))
+
 		// Check Intermediate image of stage container
 		none := podmanTest.Podman([]string{"images", "-a"})
 		none.WaitWithDefaultTimeout()

test/system/520-checkpoint.bats

@@ -22,15 +22,17 @@ function setup() {
         skip "checkpoint does not work rootless"
     fi
 
+    basic_setup
+
+    # Note basic_setup defines $PODMAN_RUNTIME so this must be after it
+
     # As of 2024-05, crun on Debian is not built with criu support:
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008249
-    runtime=$(podman_runtime)
+    runtime="$PODMAN_RUNTIME"
     run $runtime checkpoint --help
     if [[ $status -ne 0 ]]; then
         skip "runtime $runtime does not support checkpoint/restore"
     fi
-
-    basic_setup
 }
 
 # bats test_tags=ci:parallel
@@ -236,6 +238,12 @@ function setup() {
 
 # bats test_tags=ci:parallel
 @test "podman checkpoint/restore ip and mac handling" {
+    # Broken only debian as it seems the host's /etc/hosts file keeps changing
+    # which causes false positives in the before/after restore comparison.
+    OS_RELEASE_ID="${OS_RELEASE_ID:-$(source /etc/os-release; echo $ID)}"
+    if [[ "$OS_RELEASE_ID" == "debian" ]]; then
+        skip "Test flakes on debian in CI"
+    fi
     # Refer to https://github.com/containers/podman/issues/16666#issuecomment-1337860545
     # for the correct behavior, this should cover all cases listed there.
     local netname="net-$(safename)"