diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-14 10:40:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 10:40:34 -0500 |
| commit | 2854cdcd5829037a16659b46839b27fd5d58591f (patch) | |
| tree | 109d50c4d048c4e2852f2eb654a72e558db6ece0 /test/system/030-run.bats | |
| parent | 0fd31e29948631c264df21a128b3de2700f7f007 (diff) | |
| parent | 4d7e05f9ba583498abbdef48353b1fa9d8b711f5 (diff) | |
| download | podman-2854cdcd5829037a16659b46839b27fd5d58591f.tar.gz podman-2854cdcd5829037a16659b46839b27fd5d58591f.tar.bz2 podman-2854cdcd5829037a16659b46839b27fd5d58591f.zip | |
Merge pull request #8714 from edsantiago/more_journald_rootless_skips
RHEL gating tests: more journald exceptions
Diffstat (limited to 'test/system/030-run.bats')
| -rw-r--r-- | test/system/030-run.bats | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 3ee141f5f..23f924de2 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -415,13 +415,18 @@ json-file | f fi if [[ $driver != 'none' ]]; then - run_podman logs myctr - is "$output" "$msg" "check that podman logs works as expected" + if [[ $driver = 'journald' ]] && journald_unavailable; then + # Cannot perform check + : + else + run_podman logs myctr + is "$output" "$msg" "podman logs, with driver '$driver'" + fi else run_podman 125 logs myctr if ! is_remote; then is "$output" ".*this container is using the 'none' log driver, cannot read logs.*" \ - "podman logs does not work with none log driver" + "podman logs, with driver 'none', should fail with error" fi fi run_podman rm myctr @@ -437,14 +442,7 @@ json-file | f 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 + skip_if_journald_unavailable msg=$(random_string 20) pidfile="${PODMAN_TMPDIR}/$(random_string 20)" |