From c7bb28732f0c5d6e964197753d1d8d8a6a591d2f Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 27 Nov 2015 13:29:51 +0000 Subject: tests: don't run test on incomplete setup This is a follow-up commit for https://github.com/systemd/systemd/pull/1937 See https://github.com/systemd/systemd/pull/2030 --- test/TEST-04-JOURNAL/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh index e37cb7d412..6c5b5cf34e 100755 --- a/test/TEST-04-JOURNAL/test.sh +++ b/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" -- cgit v1.2.3-54-g00ecf From e8e5a6e255bc04a2a96cebbb84bd3f73a902c219 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 27 Nov 2015 13:55:23 +0000 Subject: tests: use sync instead of flush flush doesn't sync a journal -> tests sometimes fail --- test/TEST-04-JOURNAL/test-journal.sh | 12 ++++++------ 1 file 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 -- cgit v1.2.3-54-g00ecf