diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-16 08:54:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-16 08:54:44 +0000 |
| commit | 754ec89a8a185d308ca5ed08afaf34d6cbda08da (patch) | |
| tree | 707eec6efc659ec0bb00bd9337466eacad37e883 | |
| parent | edb3f70bccd2eae14ddd95c74db35731b508f407 (diff) | |
| parent | eb2496a77efc1d47a93a1b24548e3761ffe99770 (diff) | |
| download | podman-754ec89a8a185d308ca5ed08afaf34d6cbda08da.tar.gz podman-754ec89a8a185d308ca5ed08afaf34d6cbda08da.tar.bz2 podman-754ec89a8a185d308ca5ed08afaf34d6cbda08da.zip | |
Merge pull request #15326 from edsantiago/rhel8_test_skip
[v4.2] Skip / update some tests under runc
| -rw-r--r-- | test/system/160-volumes.bats | 8 | ||||
| -rw-r--r-- | test/system/251-system-service.bats | 4 | ||||
| -rw-r--r-- | test/system/410-selinux.bats | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats index dfc1a8413..6829c6a78 100644 --- a/test/system/160-volumes.bats +++ b/test/system/160-volumes.bats @@ -149,16 +149,16 @@ EOF # By default, volumes are mounted exec, but we have manually added the # noexec option. This should fail. - # ARGH. Unfortunately, runc (used for cgroups v1) produces a different error + # ARGH. Unfortunately, runc (used for cgroups v1) has different exit status local expect_rc=126 - local expect_msg='.* OCI permission denied.*' if [[ $(podman_runtime) = "runc" ]]; then expect_rc=1 - expect_msg='.* exec user process caused.*permission denied' fi run_podman ${expect_rc} run --rm --volume $myvolume:/vol:noexec,z $IMAGE /vol/myscript - is "$output" "$expect_msg" "run on volume, noexec" + # crun and runc emit different messages, and even runc is inconsistent + # with itself (output changed some time in 2022?). Deal with all. + assert "$output" =~ 'exec.* permission denied' "run on volume, noexec" # With the default, it should pass run_podman run --rm -v $myvolume:/vol:z $IMAGE /vol/myscript diff --git a/test/system/251-system-service.bats b/test/system/251-system-service.bats index edee4a28c..197d1cb18 100644 --- a/test/system/251-system-service.bats +++ b/test/system/251-system-service.bats @@ -17,6 +17,10 @@ function teardown() { @test "podman-system-service containers survive service stop" { skip_if_remote "podman system service unavailable over remote" + local runtime=$(podman_runtime) + if [[ "$runtime" != "crun" ]]; then + skip "survival code only implemented in crun; you're using $runtime" + fi port=$(random_free_port) URL=tcp://127.0.0.1:$port diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats index d437465a4..52c428884 100644 --- a/test/system/410-selinux.bats +++ b/test/system/410-selinux.bats @@ -209,7 +209,7 @@ function check_label() { # https://github.com/opencontainers/selinux/pull/148/commits/a5dc47f74c56922d58ead05d1fdcc5f7f52d5f4e # from failed to set /proc/self/attr/keycreate on procfs # to write /proc/self/attr/keycreate: invalid argument - runc) expect="OCI runtime error: .*: \(failed to set|write\) /proc/self/attr/keycreate" ;; + runc) expect="OCI runtime error: .*: \(failed to set\|write\) /proc/self/attr/keycreate.*" ;; *) skip "Unknown runtime '$runtime'";; esac |