Merge pull request #8284 from edsantiago/bats

system tests: skip journald tests on RHEL8
containers · Nov 10, 2020 · a64c6dc · a64c6dc
2 parents 81c973c + c62c648
commit a64c6dc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git 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
@@ -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