diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-05-14 09:55:25 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-05-14 09:55:25 -0600 |
| commit | cd85ba196d89c6d9ba9a8a2b27dc8bfeca5effb4 (patch) | |
| tree | 426319bbda082dfd2f9f7c156fb80b2354ead821 /test/system/030-run.bats | |
| parent | 7e9ed37c0997d6dd2d6fc6ed6476039ee954286c (diff) | |
| download | podman-cd85ba196d89c6d9ba9a8a2b27dc8bfeca5effb4.tar.gz podman-cd85ba196d89c6d9ba9a8a2b27dc8bfeca5effb4.tar.bz2 podman-cd85ba196d89c6d9ba9a8a2b27dc8bfeca5effb4.zip | |
system tests: small fixes for rawhide+cgroups v1
Three small fixes for breaking tests on rawhide:
1) run test: looks like runc changed the format of
an error message, adding a colon in one place.
runc is used on rawhide when booted in cgroups v1
2) volumes test: difference in exit status and error
message between runc and crun.
3) systemd test: define XDG_RUNTIME_DIR if unset.
podman helpfully sets this to a reasonable default,
but the 'systemctl' commands used in this test do not.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/030-run.bats')
| -rw-r--r-- | test/system/030-run.bats | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index ae2e39d6b..1bcf3896f 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -8,8 +8,8 @@ load helpers # 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" + 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 }}' |