|
 |
6f381c |
From afcfb65ce7514bf32e59e0b9d212ae18d023a4b5 Mon Sep 17 00:00:00 2001
|
|
|
6f381c |
From: Benjamin Robin <dev@benjarobin.fr>
|
|
|
6f381c |
Date: Sat, 9 May 2020 12:01:07 +0200
|
|
|
6f381c |
Subject: [PATCH] test: Stricter test case for #15654 (Add more checks)
|
|
|
6f381c |
|
|
|
6f381c |
Check:
|
|
|
6f381c |
- There is only 3 messages logged with type stdout
|
|
|
6f381c |
- Check all messages logged does not have new line: LINE_BREAK=eof
|
|
|
6f381c |
- Check that the 3 messages are logged from a different PID
|
|
|
6f381c |
- Check the 3 MESSAGE= content
|
|
|
6f381c |
(cherry picked from commit d38b3b74dbde2d65b23e5963354c3db96acd3420)
|
|
|
6f381c |
|
|
|
6f381c |
Related: #2029426
|
|
|
6f381c |
---
|
|
|
6f381c |
test/TEST-04-JOURNAL/test-journal.sh | 4 ++++
|
|
|
6f381c |
1 file changed, 4 insertions(+)
|
|
|
6f381c |
|
|
|
6f381c |
diff --git a/test/TEST-04-JOURNAL/test-journal.sh b/test/TEST-04-JOURNAL/test-journal.sh
|
|
|
6f381c |
index bdf137cd69..641259ce24 100755
|
|
|
6f381c |
--- a/test/TEST-04-JOURNAL/test-journal.sh
|
|
|
6f381c |
+++ b/test/TEST-04-JOURNAL/test-journal.sh
|
|
|
6f381c |
@@ -83,6 +83,10 @@ systemd-cat -t "$ID" /bin/sh -c 'env echo -n "This will";echo;env echo -n "usual
|
|
|
6f381c |
journalctl --sync
|
|
|
6f381c |
journalctl -b -o cat -t "$ID" >/output
|
|
|
6f381c |
cmp /expected /output
|
|
|
6f381c |
+[[ $(journalctl -b -o export -t "$ID" --output-fields=_TRANSPORT | grep -Pc "^_TRANSPORT=stdout$") -eq 3 ]]
|
|
|
6f381c |
+[[ $(journalctl -b -o export -t "$ID" --output-fields=_LINE_BREAK | grep -Pc "^_LINE_BREAK=pid-change$") -eq 3 ]]
|
|
|
6f381c |
+[[ $(journalctl -b -o export -t "$ID" --output-fields=_PID | sort -u | grep -c "^_PID=.*$") -eq 3 ]]
|
|
|
6f381c |
+[[ $(journalctl -b -o export -t "$ID" --output-fields=MESSAGE | grep -Pc "^MESSAGE=(This will|usually fail|and be truncated)$") -eq 3 ]]
|
|
|
6f381c |
|
|
|
6f381c |
# Add new tests before here, the journald restarts below
|
|
|
6f381c |
# may make tests flappy.
|