diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 1d648ea878..5f91adb48d 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -1010,6 +1010,7 @@ EOF run_podman rm $output } +# bats file_tags=distro-integration @test "podman run --device-read-bps" { skip_if_rootless "cannot use this flag in rootless mode" # this test is a triple check on blkio flags since they seem to sneak by the tests diff --git a/test/system/060-mount.bats b/test/system/060-mount.bats index 7696551024..64b2b3b8df 100644 --- a/test/system/060-mount.bats +++ b/test/system/060-mount.bats @@ -305,6 +305,7 @@ EOF is "$output" "bar1.*bar2.*bar3" "Should match multiple source files on single destination directory" } +# bats test_tags=distro-integration @test "podman mount noswap memory mounts" { # tmpfs+noswap new in kernel 6.x, mid-2023; likely not in RHEL for a while if ! is_rootless; then diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats index 044a8ae9cd..9521954f7d 100644 --- a/test/system/250-systemd.bats +++ b/test/system/250-systemd.bats @@ -299,7 +299,7 @@ LISTEN_FDNAMES=listen_fdnames" | sort) } # https://github.com/containers/podman/issues/13153 -@test "podman rootless-netns pasta processes should be in different cgroup" { +@test "podman rootless-netns processes should be in different cgroup" { is_rootless || skip "only meaningful for rootless" cname=$(random_string) diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats index e57606fc2e..c09e49ed9b 100644 --- a/test/system/252-quadlet.bats +++ b/test/system/252-quadlet.bats @@ -176,6 +176,7 @@ function wait_for_journal() { die "Timed out waiting for '$expect_str' in journalctl output" } +# bats test_tags=distro-integration @test "quadlet - basic" { # Network=none is to work around a Pasta bug, can be removed once a patched Pasta is available. # Ref https://github.com/containers/podman/pull/21563#issuecomment-1965145324 diff --git a/test/system/280-update.bats b/test/system/280-update.bats index 13699e20b6..6013aa17e7 100644 --- a/test/system/280-update.bats +++ b/test/system/280-update.bats @@ -117,6 +117,7 @@ device-write-iops = /dev/zero:4000 | - | - run_podman update "${opts[@]}" $cid # ...and check one by one + defer-assertion-failures for opt in "${opts[@]}"; do read path op expect <<<"${check[$opt]}" run_podman exec $cid cat /sys/fs/cgroup/$path @@ -126,6 +127,7 @@ device-write-iops = /dev/zero:4000 | - | - updated="$(echo $output)" assert "$updated" $op "$expect" "$opt ($path)" done + immediate-assertion-failures # Clean up run_podman rm -f -t0 $cid diff --git a/test/system/420-cgroups.bats b/test/system/420-cgroups.bats index 928278ac26..62cb6aa4ee 100644 --- a/test/system/420-cgroups.bats +++ b/test/system/420-cgroups.bats @@ -37,6 +37,7 @@ load helpers run_podman rm myc } +# bats test_tags=distro-integration @test "podman run --cgroups=disabled keeps the current cgroup" { skip_if_remote "podman-remote does not support --cgroups=disabled" skip_if_rootless_cgroupsv1 diff --git a/test/system/700-play.bats b/test/system/700-play.bats index b93091be12..7c26a4fa8e 100644 --- a/test/system/700-play.bats +++ b/test/system/700-play.bats @@ -398,6 +398,8 @@ _EOF _write_test_yaml command=id image=quay.io/libpod/userimage run_podman 125 play kube --build --start=false $PODMAN_TMPDIR/test.yaml + assert "$output" =~ "initializing source docker://quay.io/libpod/userimage:latest: reading manifest latest in " + run_podman play kube --replace --context-dir=$PODMAN_TMPDIR --build --start=false $PODMAN_TMPDIR/test.yaml run_podman inspect --format "{{ .Config.User }}" test_pod-test is "$output" bin "expect container within pod to run as the bin user"