opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12958 from dgibson/ociplex-test

Browse Source 
Remove some explicit dependencies on runc/crun in the system tests
This commit is contained in:
OpenShift Merge Robot
2022-01-21 06:47:25 -05:00
committed by GitHub
parent 845256bdb3 0b5136c7ce
commit 11c5717cdb
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/system/005-info.bats
View File

@ -43,7 +43,6 @@ host.conmon.package | .*conmon.*
host.cgroupManager | \\\(systemd\\\|cgroupfs\\\) host.cgroupManager | \\\(systemd\\\|cgroupfs\\\)
host.cgroupVersion | v[12] host.cgroupVersion | v[12]
host.ociRuntime.path | $expr_path host.ociRuntime.path | $expr_path
host.ociRuntime.package | .*\\\(crun\\\|runc\\\).*
store.configFile | $expr_path store.configFile | $expr_path
store.graphDriverName | [a-z0-9]\\\+\\\$ store.graphDriverName | [a-z0-9]\\\+\\\$
store.graphRoot | $expr_path store.graphRoot | $expr_path

14
test/system/030-run.bats
View File

@ -5,18 +5,8 @@ load helpers
@test "podman run - basic tests" { @test "podman run - basic tests" {
rand=$(random_string 30) rand=$(random_string 30)
# 2019-09 Fedora 31 and rawhide (32) are switching from runc to crun err_no_such_cmd="Error:.*/no/such/command.*[Nn]o such file or directory"
# because of cgroups v2; crun emits different error messages. err_no_exec_dir="Error:.*exec.*permission denied"
# Default to runc:
err_no_such_cmd="Error: .*: starting container process caused.*exec:.*stat /no/such/command: no such file or directory"
err_no_exec_dir="Error: .*: starting container process caused.*exec:.* permission denied"
# ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/crun"; then
err_no_such_cmd="Error: crun: executable file.* not found in \$PATH: No such file or directory: OCI runtime attempted to invoke a command that was not found"
err_no_exec_dir="Error: crun: open executable: Operation not permitted: OCI permission denied"
fi
tests=" tests="
true | 0 | true | 0 |