Merge pull request #2049 from evverx/journal-test-dont-run-on-incomplete-setup

tests: don't run test on incomplete setup; use sync

test/TEST-04-JOURNAL/test-journal.sh

@@ -10,14 +10,14 @@ set -o pipefail
 ID=$(journalctl --new-id128 | sed -n 2p)
 >/expected
 printf $'\n\n\n' | systemd-cat -t "$ID" --level-prefix false
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
 ID=$(journalctl --new-id128 | sed -n 2p)
 >/expected
 printf $'<5>\n<6>\n<7>\n' | systemd-cat -t "$ID" --level-prefix true
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
@@ -25,14 +25,14 @@ cmp /expected /output
 ID=$(journalctl --new-id128 | sed -n 2p)
 printf "Trailing spaces\n">/expected
 printf $'<5>Trailing spaces \t \n' | systemd-cat -t "$ID" --level-prefix true
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
 ID=$(journalctl --new-id128 | sed -n 2p)
 printf "Trailing spaces\n">/expected
 printf $'Trailing spaces \t \n' | systemd-cat -t "$ID" --level-prefix false
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
@@ -40,14 +40,14 @@ cmp /expected /output
 ID=$(journalctl --new-id128 | sed -n 2p)
 printf $' \t Leading spaces\n'>/expected
 printf $'<5> \t Leading spaces\n' | systemd-cat -t "$ID" --level-prefix true
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
 ID=$(journalctl --new-id128 | sed -n 2p)
 printf $' \t Leading spaces\n'>/expected
 printf $' \t Leading spaces\n' | systemd-cat -t "$ID" --level-prefix false
-journalctl --flush
+journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 

test/TEST-04-JOURNAL/test.sh

@@ -60,7 +60,7 @@ EOF
         cp test-journal.sh $initdir/
 
         setup_testsuite
-    )
+    ) || return 1
     setup_nspawn_root
 
     ddebug "umount $TESTDIR/root"