rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench bugfix: journal tests did not actually check for success

Browse Source 
For some unknown reason, the check if data really was forwarded from
the journal was missing.

see also https://github.com/rsyslog/rsyslog/issues/2564
This commit is contained in:
Rainer Gerhards 2018-03-19 15:31:52 +01:00
parent c325b096e9
commit 92cdd28c76
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/imjournal-basic-vg.sh
View File

@ -9,6 +9,7 @@
# addd 2017-10-25 by RGerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh require-journalctl
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
module(load="../plugins/imjournal/.libs/imjournal")
@ -23,12 +24,13 @@ TESTMSG="TestBenCH-RSYSLog imjournal This is a test message - $(date +%s)"
. $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
. $srcdir/diag.sh wait-shutdown-vg
. $srcdir/diag.sh check-exit-vg
if [ $? -eq 1 ]; then
journalctl -q | grep -qF "$TESTMSG"
if [ $? -ne 0 ]; then
echo "FAIL: rsyslog.out.log content (tail -n200):"
tail -n200 rsyslog.out.log
echo "======="
echo "last entries from journal:"
journalctl|tail -n200
journalctl -q|tail -n200
echo "======="
echo "NOTE: last 200 lines may be insufficient on busy systems!"
echo "======="

6
tests/imjournal-basic.sh
View File

@ -9,6 +9,7 @@
# addd 2017-10-25 by RGerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh require-journalctl
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
module(load="../plugins/imjournal/.libs/imjournal")
@ -22,12 +23,13 @@ TESTMSG="TestBenCH-RSYSLog imjournal This is a test message - $(date +%s)"
./msleep 500
. $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
. $srcdir/diag.sh wait-shutdown
if [ $? -eq 1 ]; then
journalctl -q | grep -qF "$TESTMSG"
if [ $? -ne 0 ]; then
echo "FAIL: rsyslog.out.log content (tail -n200):"
tail -n200 rsyslog.out.log
echo "======="
echo "last entries from journal:"
journalctl|tail -n200
journalctl -q|tail -n200
echo "======="
echo "NOTE: last 200 lines may be insufficient on busy systems!"
echo "======="