diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-27 13:55:23 +0000 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-27 13:55:23 +0000 |
| commit | e8e5a6e255bc04a2a96cebbb84bd3f73a902c219 (patch) | |
| tree | 4b16890ed4f14766d52b869f856952bcc4c8c8d9 /test/TEST-04-JOURNAL | |
| parent | c7bb28732f0c5d6e964197753d1d8d8a6a591d2f (diff) | |
tests: use sync instead of flush
flush doesn't sync a journal -> tests sometimes fail
Diffstat (limited to 'test/TEST-04-JOURNAL')
| -rwxr-xr-x | test/TEST-04-JOURNAL/test-journal.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/TEST-04-JOURNAL/test-journal.sh b/test/TEST-04-JOURNAL/test-journal.sh index 956e377100..1ee39df432 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 |