shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

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

Browse Source 
tests: don't run test on incomplete setup; use sync
This commit is contained in:
Daniel Mack 2015-11-27 15:26:21 +01:00
commit f5edf80e29
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/TEST-04-JOURNAL/test-journal.sh
View File

@ -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

2
test/TEST-04-JOURNAL/test.sh
View File

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