diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
commit | d50f1e711ffd479d1ddbc89342e9b28b8b9abba9 (patch) | |
tree | 8364adc48f18f3fafb66990a0ed6a55e66a16da5 /tests | |
parent | f813c01258ec5ef3adc8f4790c5c743c2f4b462a (diff) | |
parent | 3866bd51bf7e622594ff4831664c28d80f711cb3 (diff) | |
download | rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.gz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.xz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.zip |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 5 | ||||
-rwxr-xr-x | tests/discard-rptdmsg.sh | 17 | ||||
-rwxr-xr-x | tests/imtcp_conndrop.sh | 2 | ||||
-rw-r--r-- | tests/testsuites/discard-rptdmsg.conf | 15 |
4 files changed, 37 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2e2e47aa..c834ef6e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,6 +48,8 @@ TESTS = $(TESTRUNS) cfg.sh \ imuxsock_logger_root.sh \ imuxsock_traillf_root.sh \ imuxsock_ccmiddle_root.sh \ + discard-rptdmsg.sh \ + discard.sh \ queue-persist.sh if ENABLE_IMPTCP @@ -75,7 +77,6 @@ TESTS += omod-if-array.sh \ inputname.sh \ threadingmq.sh \ threadingmqaq.sh \ - discard.sh \ badqi.sh \ tabescape_dflt.sh \ tabescape_off.sh \ @@ -221,6 +222,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ omod-if-array.sh \ discard.sh \ testsuites/discard.conf \ + discard-rptdmsg.sh \ + testsuites/discard-rptdmsg.conf \ diag.sh \ testsuites/diag-common.conf \ testsuites/diag-common2.conf \ diff --git a/tests/discard-rptdmsg.sh b/tests/discard-rptdmsg.sh new file mode 100755 index 00000000..a8b35c38 --- /dev/null +++ b/tests/discard-rptdmsg.sh @@ -0,0 +1,17 @@ +# Test for discard-rptdmsg functionality +# This test checks if discard-rptdmsg works. It is not a perfect test but +# will find at least segfaults and obviously not discard-rptdmsged messages. +# added 2009-07-30 by Rgerhards +# This file is part of the rsyslog project, released under GPLv3 +# uncomment for debugging support: +echo =============================================================================== +echo \[discard-rptdmsg.sh\]: testing discard-rptdmsg functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh startup discard-rptdmsg.conf +# 20000 messages should be enough - the disk test is slow enough ;) +sleep 4 +source $srcdir/diag.sh tcpflood -m10 -i1 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh seq-check 2 10 +source $srcdir/diag.sh exit diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh index 2caa0ce2..9855ee3b 100755 --- a/tests/imtcp_conndrop.sh +++ b/tests/imtcp_conndrop.sh @@ -6,7 +6,7 @@ echo =========================================================================== echo TEST: \[imtcp_conndrop.sh\]: test imtcp with random connection drops cat rsyslog.action.1.include source $srcdir/diag.sh init -source $srcdir/diag.sh startup imptcp_large.conf +source $srcdir/diag.sh startup imtcp_conndrop.conf # 100 byte messages to gain more practical data use source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D sleep 4 # due to large messages, we need this time for the tcp receiver to settle... diff --git a/tests/testsuites/discard-rptdmsg.conf b/tests/testsuites/discard-rptdmsg.conf new file mode 100644 index 00000000..74060e31 --- /dev/null +++ b/tests/testsuites/discard-rptdmsg.conf @@ -0,0 +1,15 @@ +# Test for discard functionality +# rgerhards, 2009-07-30 +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/imtcp/.libs/imtcp +$MainMsgQueueTimeoutShutdown 10000 +$InputTCPServerRun 13514 + +$RepeatedMsgReduction on + +:msg, contains, "00000001" ~ + +$template outfmt,"%msg:F,58:2%\n" +$template dynfile,"rsyslog.out.log" # trick to use relative path names! +:msg, contains, "msgnum:" ?dynfile;outfmt |