diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-16 14:33:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 14:33:23 +0000 |
| commit | e3a0deadce9d1aa2ead5adc1d0ee4e8868a18c3a (patch) | |
| tree | e14688a527683e8c9dd1bdf16734f0cf3670c788 | |
| parent | e2255d9a688d52debac6b6ded2da644392612634 (diff) | |
| parent | b3f094a61c70a7ef9d1c0c47b926f3b5dc21d889 (diff) | |
| download | podman-e3a0deadce9d1aa2ead5adc1d0ee4e8868a18c3a.tar.gz podman-e3a0deadce9d1aa2ead5adc1d0ee4e8868a18c3a.tar.bz2 podman-e3a0deadce9d1aa2ead5adc1d0ee4e8868a18c3a.zip | |
Merge pull request #14613 from kolyshkin/fix-410-selinux
test/system/410-selinux: fix for newer runc
| -rw-r--r-- | test/system/410-selinux.bats | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats index 21ac4cb8f..d437465a4 100644 --- a/test/system/410-selinux.bats +++ b/test/system/410-selinux.bats @@ -205,7 +205,11 @@ function check_label() { # 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" ;; + # runc 1.1 changed the error message because of new selinux pkg that uses standard os.PathError, see + # 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" ;; *) skip "Unknown runtime '$runtime'";; esac |