diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-27 15:26:21 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-27 15:26:21 +0100 |
| commit | f5edf80e297e4ba499db57779af2f121922f372a (patch) | |
| tree | 6e4cbe6a925228172037ceb90108ab45cf13d83a | |
| parent | 23ede49ee2f18583bef69d47327a9a759870c671 (diff) | |
| parent | e8e5a6e255bc04a2a96cebbb84bd3f73a902c219 (diff) | |
Merge pull request #2049 from evverx/journal-test-dont-run-on-incomplete-setup
tests: don't run test on incomplete setup; use sync
| -rwxr-xr-x | test/TEST-04-JOURNAL/test-journal.sh | 12 | ||||
| -rwxr-xr-x | test/TEST-04-JOURNAL/test.sh | 2 |
2 files changed, 7 insertions, 7 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 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" |