diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-09 15:41:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 15:41:45 -0400 |
| commit | ea39735845655aaf77de577a35557a0fb003514f (patch) | |
| tree | 745712fdc93c3042b4760d8806eef29b8062df44 /test/system | |
| parent | 2970e3518cc95910444903f572418f5887316e47 (diff) | |
| parent | d5527c3304194b97b4b5cd93a4c7c16299c70492 (diff) | |
| download | podman-ea39735845655aaf77de577a35557a0fb003514f.tar.gz podman-ea39735845655aaf77de577a35557a0fb003514f.tar.bz2 podman-ea39735845655aaf77de577a35557a0fb003514f.zip | |
Merge pull request #10618 from edsantiago/bats
System tests: deal with crun 0.20.1
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/410-selinux.bats | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats index f8cee0e59..4ef9c8b30 100644 --- a/test/system/410-selinux.bats +++ b/test/system/410-selinux.bats @@ -183,7 +183,10 @@ function check_label() { # runc and crun emit different diagnostics runtime=$(podman_runtime) case "$runtime" in - crun) expect="\`/proc/thread-self/attr/exec\`: OCI runtime error: unable to assign security attribute" ;; + # crun 0.20.1 changes the error message + # from /proc/thread-self/attr/exec`: .* unable to assign + # to /proc/self/attr/keycreate`: .* unable to process + crun) expect="\`/proc/.*\`: OCI runtime error: unable to \(assign\|process\) security attribute" ;; runc) expect="OCI runtime error: .*: failed to set /proc/self/attr/keycreate on procfs" ;; *) skip "Unknown runtime '$runtime'";; esac |