diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-06-09 10:04:11 -0600 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-06-11 11:09:42 -0400 |
| commit | 6beae86f014ceb1ad2f0a33b626b7881bf17e419 (patch) | |
| tree | cb7e68bc37787dc6fb1dca9e616d3fd854a3b9a5 /test | |
| parent | 80362b34c4d23fe8a46136422572469285cb80b1 (diff) | |
| download | podman-6beae86f014ceb1ad2f0a33b626b7881bf17e419.tar.gz podman-6beae86f014ceb1ad2f0a33b626b7881bf17e419.tar.bz2 podman-6beae86f014ceb1ad2f0a33b626b7881bf17e419.zip | |
System tests: deal with crun 0.20.1
crun 0.20.1 changed an error message that we relied on. Deal
with it by accepting the old and new message.
Also (unrelated): sneak in some doc fixes to get rid of
nasty go-md2man warnings that have crept into man pages.
Signed-off-by: Ed Santiago <santiago@redhat.com>
<MH: Fixed cherry-pick conflicts>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'test')
| -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 |