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

system tests: small fixes for rawhide+cgroups v1

Browse Source 
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>
This commit is contained in:
Ed Santiago
2020-05-14 09:55:25 -06:00
parent 7e9ed37c09
commit cd85ba196d
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,8 @@ load helpers
# 2019-09 Fedora 31 and rawhide (32) are switching from runc to crun # 2019-09 Fedora 31 and rawhide (32) are switching from runc to crun
# because of cgroups v2; crun emits different error messages. # because of cgroups v2; crun emits different error messages.
# Default to runc: # Default to runc:
err_no_such_cmd="Error: .*: starting container process caused .*exec:.*stat /no/such/command: no such file or directory" 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_exec_dir="Error: .*: starting container process caused.*exec:.* permission denied"
# ...but check the configured runtime engine, and switch to crun as needed # ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}' run_podman info --format '{{ .Host.OCIRuntime.Path }}'

13
test/system/160-volumes.bats
View File

@ -116,8 +116,17 @@ EOF
chmod 755 $mountpoint/myscript chmod 755 $mountpoint/myscript
# By default, volumes are mounted noexec. This should fail. # By default, volumes are mounted noexec. This should fail.
run_podman 126 run --rm --volume $myvolume:/vol:z $IMAGE /vol/myscript # ARGH. Unfortunately, runc (used for cgroups v1) produces a different error
is "$output" ".* OCI runtime permission denied.*" "run on volume, noexec" local expect_rc=126
local expect_msg='.* OCI runtime permission denied.*'
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/runc"; then
expect_rc=1
expect_msg='.* exec user process caused.*permission denied'
fi
run_podman ${expect_rc} run --rm --volume $myvolume:/vol:z $IMAGE /vol/myscript
is "$output" "$expect_msg" "run on volume, noexec"
# With exec, it should pass # With exec, it should pass
run_podman run --rm -v $myvolume:/vol:z,exec $IMAGE /vol/myscript run_podman run --rm -v $myvolume:/vol:z,exec $IMAGE /vol/myscript

7
test/system/250-systemd.bats
View File

@ -33,6 +33,13 @@ function teardown() {
# This test can fail in dev. environment because of SELinux. # This test can fail in dev. environment because of SELinux.
# quick fix: chcon -t container_runtime_exec_t ./bin/podman # quick fix: chcon -t container_runtime_exec_t ./bin/podman
@test "podman generate - systemd - basic" { @test "podman generate - systemd - basic" {
# podman initializes this if unset, but systemctl doesn't
if is_rootless; then
if [ -z "$XDG_RUNTIME_DIR" ]; then
export XDG_RUNTIME_DIR=/run/user/$(id -u)
fi
fi
cname=$(random_string) cname=$(random_string)
run_podman create --name $cname --detach $IMAGE top run_podman create --name $cname --detach $IMAGE top