diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-10 01:38:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 01:38:46 +0000 |
| commit | a64c6dc90a6d315bc4cccae9fbd13788daa23fb7 (patch) | |
| tree | 2616737a33638239cae5d9ecf41b3258f4cd3ce6 | |
| parent | 81c973c51f77c7388c762bf77d8eb11622cc5333 (diff) | |
| parent | c62c64856e3495ca879b68b99e502070f8c58947 (diff) | |
| download | podman-a64c6dc90a6d315bc4cccae9fbd13788daa23fb7.tar.gz podman-a64c6dc90a6d315bc4cccae9fbd13788daa23fb7.tar.bz2 podman-a64c6dc90a6d315bc4cccae9fbd13788daa23fb7.zip | |
Merge pull request #8284 from edsantiago/bats
system tests: skip journald tests on RHEL8
| -rw-r--r-- | test/system/030-run.bats | 10 | ||||
| -rw-r--r-- | test/system/035-logs.bats | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index b0c855d81..12df966e2 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -436,6 +436,16 @@ json-file | f @test "podman run --log-driver journald" { 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) pidfile="${PODMAN_TMPDIR}/$(random_string 20)" diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 130bc5243..a3d6a5800 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -51,6 +51,16 @@ ${cid[0]} d" "Sequential output from logs" } @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) run_podman run --name myctr --log-driver journald $IMAGE echo $msg |