containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8284 from edsantiago/bats 

system tests: skip journald tests on RHEL8
This commit is contained in:
OpenShift Merge Robot 2020-11-10 01:38:46 +00:00 committed by GitHub
parent 81c973c51f c62c64856e
commit a64c6dc90a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,6 +436,16 @@ json-file | f
@test "podman run --log-driver journald" { @test "podman run --log-driver journald" {
skip_if_remote "We cannot read journalctl over remote." skip_if_remote "We cannot read journalctl over remote."
# We can't use journald on RHEL as rootless, either: rhbz#1895105
if is_rootless; then
run journalctl -n 1
if [[ $status -ne 0 ]]; then
if [[ $output =~ permission ]]; then
skip "Cannot use rootless journald on this system"
fi
fi
fi
msg=$(random_string 20) msg=$(random_string 20)
pidfile="${PODMAN_TMPDIR}/$(random_string 20)" pidfile="${PODMAN_TMPDIR}/$(random_string 20)"

10
test/system/035-logs.bats
View File

@ -51,6 +51,16 @@ ${cid[0]} d" "Sequential output from logs"
} }
@test "podman logs over journald" { @test "podman logs over journald" {
# We can't use journald on RHEL as rootless: rhbz#1895105
if is_rootless; then
run journalctl -n 1
if [[ $status -ne 0 ]]; then
if [[ $output =~ permission ]]; then
skip "Cannot use rootless journald on this system"
fi
fi
fi
msg=$(random_string 20) msg=$(random_string 20)
run_podman run --name myctr --log-driver journald $IMAGE echo $msg run_podman run --name myctr --log-driver journald $IMAGE echo $msg