diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-06-09 10:04:11 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-06-09 10:15:12 -0600 |
| commit | d5527c3304194b97b4b5cd93a4c7c16299c70492 (patch) | |
| tree | 745712fdc93c3042b4760d8806eef29b8062df44 /test/system | |
| parent | 2970e3518cc95910444903f572418f5887316e47 (diff) | |
| download | podman-d5527c3304194b97b4b5cd93a4c7c16299c70492.tar.gz podman-d5527c3304194b97b4b5cd93a4c7c16299c70492.tar.bz2 podman-d5527c3304194b97b4b5cd93a4c7c16299c70492.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>
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 |