diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-21 06:47:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 06:47:25 -0500 |
| commit | 11c5717cdb5a019ff416fa07b9192cc87c29c13d (patch) | |
| tree | 10001e33d6df6fd035aa2f1c3a7be8d6dfe793a4 /test | |
| parent | 845256bdb356bf280347c41de76f5998faa9e24b (diff) | |
| parent | 0b5136c7cefb52a18eec9e69c5d27d82b04ea867 (diff) | |
| download | podman-11c5717cdb5a019ff416fa07b9192cc87c29c13d.tar.gz podman-11c5717cdb5a019ff416fa07b9192cc87c29c13d.tar.bz2 podman-11c5717cdb5a019ff416fa07b9192cc87c29c13d.zip | |
Merge pull request #12958 from dgibson/ociplex-test
Remove some explicit dependencies on runc/crun in the system tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/005-info.bats | 1 | ||||
| -rw-r--r-- | test/system/030-run.bats | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 045045fa6..5f3cdff7e 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -43,7 +43,6 @@ host.conmon.package | .*conmon.* host.cgroupManager | \\\(systemd\\\|cgroupfs\\\) host.cgroupVersion | v[12] host.ociRuntime.path | $expr_path -host.ociRuntime.package | .*\\\(crun\\\|runc\\\).* store.configFile | $expr_path store.graphDriverName | [a-z0-9]\\\+\\\$ store.graphRoot | $expr_path diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 2d5ecab39..ec85ef166 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -5,18 +5,8 @@ load helpers @test "podman run - basic tests" { rand=$(random_string 30) - # 2019-09 Fedora 31 and rawhide (32) are switching from runc to crun - # because of cgroups v2; crun emits different error messages. - # 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 + err_no_such_cmd="Error:.*/no/such/command.*[Nn]o such file or directory" + err_no_exec_dir="Error:.*exec.*permission denied" tests=" true | 0 | |