Merge pull request #28855 from Honny1/flakes-hunt

Fix multiple flakes

libpod/container_internal_linux.go

@@ -45,12 +45,12 @@ func (c *Container) mountSHM(shmOptions string) error {
 }
 
 func (c *Container) unmountSHM(mount string) error {
-	if err := unix.Unmount(mount, 0); err != nil {
-		if err != syscall.EINVAL && err != syscall.ENOENT {
-			return fmt.Errorf("unmounting container %s SHM mount %s: %w", c.ID(), mount, err)
+	if err := unix.Unmount(mount, unix.MNT_DETACH); err != nil {
+		if err == syscall.EINVAL || err == syscall.ENOENT {
+			logrus.Debugf("Container %s failed to unmount %s : %v", c.ID(), mount, err)
+			return nil
 		}
-		// If it's just an EINVAL or ENOENT, debug logs only
-		logrus.Debugf("Container %s failed to unmount %s : %v", c.ID(), mount, err)
+		return fmt.Errorf("unmounting container %s SHM mount %s: %w", c.ID(), mount, err)
 	}
 	return nil
 }

test/system/050-stop.bats

@@ -31,7 +31,7 @@ load helpers
     # exactly 10 seconds. Give it some leeway.
     delta_t=$(( $t1 - $t0 ))
     assert $delta_t -gt  8 "podman stop: ran too quickly!"
-    assert $delta_t -le 14 "podman stop: took too long"
+    assert $delta_t -le 18 "podman stop: took too long"
 
     run_podman rm $cid
 }

test/system/055-rm.bats

@@ -125,14 +125,16 @@ load helpers
 
 # DO NOT CHANGE "sleep infinity"! This is how we get a container to
 # remain in state "stopping" for long enough to check it.
+# $1 = container name, $2 = optional stop-timeout (default 2)
 function __run_healthcheck_container() {
+    local stop_timeout=${2:-2}
     run_podman run -d --name $1 \
                --health-cmd /bin/false \
                --health-interval 1s \
                --health-retries 2 \
                --health-timeout 1s \
                --health-on-failure=stop \
-               --stop-timeout=2 \
+               --stop-timeout=$stop_timeout \
                --health-start-period 0 \
                --stop-signal SIGTERM \
                $IMAGE sleep infinity
@@ -179,14 +181,14 @@ function __run_healthcheck_container() {
 # bats test_tags=ci:parallel
 @test "podman container rm --force doesn't leave running processes" {
     local cname=c-$(safename)
-    __run_healthcheck_container $cname
+    __run_healthcheck_container $cname 20
     local cid=$output
 
     # We'll use the PID later to confirm that container is not running
     run_podman inspect --format '{{.State.Pid}}' $cname
     local pid=$output
 
-    for i in {1..10}; do
+    for i in {1..20}; do
         run_podman inspect $cname --format '{{.State.Status}}'
         if [ "$output" = "stopping" ]; then
             run_podman rm -f $cname

test/system/220-healthcheck.bats

@@ -96,6 +96,10 @@ Log[-1].ExitCode | 1
 Log[-1].Output   | \"Uh-oh on stdout!\\\nUh-oh on stderr!\\\n\"
 " "$current_time" "healthy"
 
+    # Capture time before systemctl checks so we don't miss the "unhealthy"
+    # event that may fire during those checks (health-interval is only 1s).
+    current_time=$(date --iso-8601=ns)
+
     # Check that we now we do have valid podman units with this
     # name so that the leak check below does not turn into a NOP without noticing.
     run -0 systemctl list-units
@@ -110,7 +114,6 @@ Log[-1].Output   | \"Uh-oh on stdout!\\\nUh-oh on stderr!\\\n\"
     run -0 systemctl show --all "$cid-*.service"
     assert "$output" =~ "StartLimitIntervalUSec=0" "The hc service has the right interval set"
 
-    current_time=$(date --iso-8601=ns)
     # After three successive failures, container should no longer be healthy
     _check_health $ctrname "Four or more failures" "
 Status           | \"unhealthy\"