From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 27 Nov 2015 13:55:23 +0000 (+0000)
Subject: tests: use sync instead of flush
X-Git-Tag: v229~251^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8e5a6e255bc04a2a96cebbb84bd3f73a902c219;p=thirdparty%2Fsystemd.git

tests: use sync instead of flush

flush doesn't sync a journal -> tests sometimes fail
---

diff --git a/test/TEST-04-JOURNAL/test-journal.sh b/test/TEST-04-JOURNAL/test-journal.sh
index 956e3771009..1ee39df432d 100755
--- a/test/TEST-04-JOURNAL/test-journal.sh
+++ b/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