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 /test/system/160-volumes.bats | |
| 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
Diffstat (limited to 'test/system/160-volumes.bats')
| -rw-r--r-- | test/system/160-volumes.bats | 8 |
1 files changed, 4 insertions, 4 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 |