test: sync journal in short-living services

This also adjusts LogLevelMax=.

Hopefully, this makes the test much stabler.

diff --git a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
index a12b12ac4a647264f24c9b5ddee961a286ba0505..7ecd35816da6a492c9d3638bb28899c0db8a1aa6 100644 (file)
--- a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
+++ b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
@@ -6,3 +6,4 @@ Type=oneshot
 ExecStart=/usr/lib/systemd/tests/testdata/units/delegated_cgroup_filtering_payload.sh
 Delegate=yes
 SyslogLevel=notice
+LogLevelMax=info

diff --git a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
index a5aba1859c83fa996e977da83bad46fc0521338e..4c430058cf171d1521fe4da81d4b7c157a6a051a 100644 (file)
--- a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
+++ b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
@@ -3,5 +3,9 @@ Description=Log filtering unit
 
 [Service]
 Type=oneshot
-ExecStart=sh -c 'echo "Logging from the service, and ~more~ foo bar" && sleep 2'
+ExecStart=sh -c 'echo "Logging from the service, and ~more~ foo bar"'
+# If the service finishes extremely fast, journald cannot find the source of the
+# stream. Hence, we need to call 'journalctl --sync' before service finishes.
+ExecStart=journalctl --sync
 SyslogLevel=notice
+LogLevelMax=info

diff --git a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
index 3d83f87fe07c346659f2d14cbc5b3dc565504f5c..d4541afa888a539e8c685ba5bfb2387363a39cd2 100644 (file)
--- a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
+++ b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
@@ -3,5 +3,9 @@
 Description=Silent successful service
 
 [Service]
+Type=oneshot
 LogLevelMax=notice
 ExecStart=/bin/true
+# If the service finishes extremely fast, journald cannot find the source of the
+# stream. Hence, we need to call 'journalctl --sync' before service finishes.
+ExecStart=journalctl --sync

diff --git a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
index f4a86fd2b227662713069ab244f6f1a6aaee7117..004693b282c8e28dd9c0088df7d419dc7ebb5ac8 100644 (file)
--- a/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
+++ b/test/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
@@ -4,8 +4,10 @@ Description=Verbose successful service
 
 [Service]
 Type=oneshot
-# Sleep so that the cgroup is still there when journald processes the log message which is required for
-# journald to add the expected fields to the log message.
-ExecStart=sleep 2
 ExecStart=echo success
-ExecStart=sleep 2
+# If the service finishes extremely fast, journald cannot find the source of the
+# stream. Hence, we need to call 'journalctl --sync' before service finishes.
+ExecStart=journalctl --sync
+# Suppress debugging logs from PID1 or sd-executor. Otherwise, the client context
+# may be outdated when the stream from 'echo' command in the above comes.
+LogLevelMax=info

diff --git a/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh b/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
index dfa9652ee29ee2008943fe1ff8cd000cdcca5d4c..04062bd76f729cd4ba7c57ce7d732b9c2d0319cd 100755 (executable)
--- a/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
+++ b/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
@@ -20,9 +20,9 @@ run_service_and_fetch_logs() {
     local unit="${1:?}"
     local start
 
+    journalctl --sync
     start="$(date '+%Y-%m-%d %T.%6N')"
     systemctl start "$unit"
-    journalctl --sync
     journalctl -q -u "$unit" -S "$start" -p notice
 }
 

diff --git a/test/units/TEST-04-JOURNAL.journal.sh b/test/units/TEST-04-JOURNAL.journal.sh
index bb4f66d2c8940472b618c487c0ac4f962238bdfe..bd9f8a5e820b2de3d7656e0e2cd62a7a6c0a7cb7 100755 (executable)
--- a/test/units/TEST-04-JOURNAL.journal.sh
+++ b/test/units/TEST-04-JOURNAL.journal.sh
@@ -104,12 +104,10 @@ diff /tmp/expected /tmp/output
 
 # test that LogLevelMax can also suppress logging about services, not only by services
 systemctl start silent-success
-journalctl --sync
 [[ -z "$(journalctl -b -q -u silent-success.service)" ]]
 
 # Test syslog identifiers exclusion
 systemctl start verbose-success.service
-journalctl --sync
 [[ -n "$(journalctl -b -q -u verbose-success.service -t systemd)" ]]
 [[ -n "$(journalctl -b -q -u verbose-success.service -t echo)" ]]
 [[ -n "$(journalctl -b -q -u verbose-success.service -T systemd)" ]]
@@ -262,8 +260,8 @@ UNIT_NAME="test-cursor-$RANDOM.service"
 CURSOR_FILE="$(mktemp)"
 # Generate some messages we can match against
 journalctl --cursor-file="$CURSOR_FILE" -n1
-systemd-run --unit="$UNIT_NAME" --wait --service-type=exec bash -ec "sleep 2; set -x; echo hello; echo world; set +x; sleep 2"
-journalctl --sync
+systemd-run --unit="$UNIT_NAME" --wait --service-type=exec -p LogLevelMax=info \
+            bash -ec "set -x; echo hello; echo world; set +x; journalctl --sync"
 # --after-cursor= + --unit=
 # The format of the "Starting ..." message depends on StatusUnitFormat=, so match only the beginning
 # which should be enough in this case