diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-12 14:23:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-12 14:23:52 +0200 |
| commit | 2e96de39e5394008f97d6c194e507e629d836738 (patch) | |
| tree | 3ae488bea8596744e131fb1066f6ea2a01d3d79d /tests/testsuites | |
| parent | bf9714f547781f6d18f260db7bafec62391dfd6b (diff) | |
| download | rsyslog-2e96de39e5394008f97d6c194e507e629d836738.tar.gz | |
Imported Upstream version 5.8.0upstream/5.8.0
Diffstat (limited to 'tests/testsuites')
| -rw-r--r-- | tests/testsuites/diag-common.conf | 5 | ||||
| -rw-r--r-- | tests/testsuites/random.conf | 5 | ||||
| -rw-r--r-- | tests/testsuites/rcvr_fail_restore_rcvr.conf | 8 | ||||
| -rw-r--r-- | tests/testsuites/rcvr_fail_restore_sender.conf | 15 |
4 files changed, 32 insertions, 1 deletions
diff --git a/tests/testsuites/diag-common.conf b/tests/testsuites/diag-common.conf index 9e9e28f..d76e2d1 100644 --- a/tests/testsuites/diag-common.conf +++ b/tests/testsuites/diag-common.conf @@ -13,4 +13,7 @@ $IMDiagServerRun 13500 $template startupfile,"rsyslogd.started" # trick to use relative path names! :syslogtag, contains, "rsyslogd" ?startupfile -$ErrorMessagesToStderr off +# I have disabled the directive below, so that we see errors in testcase +# creation. I am not sure why it was present in the first place, so for +# now I just leave it commented out -- rgerhards, 2011-03-30 +#$ErrorMessagesToStderr off diff --git a/tests/testsuites/random.conf b/tests/testsuites/random.conf index a7079df..74ec61a 100644 --- a/tests/testsuites/random.conf +++ b/tests/testsuites/random.conf @@ -4,6 +4,11 @@ # rgerhards, 2010-04-01 $IncludeConfig diag-common.conf +# The random data will generate TCP framing error messages. We will +# not clutter the test output with them. So we disable error messages +# to stderr. +$ErrorMessagesToStderr off + $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 $InputTCPServerRun 13514 diff --git a/tests/testsuites/rcvr_fail_restore_rcvr.conf b/tests/testsuites/rcvr_fail_restore_rcvr.conf new file mode 100644 index 0000000..38ebad2 --- /dev/null +++ b/tests/testsuites/rcvr_fail_restore_rcvr.conf @@ -0,0 +1,8 @@ +$IncludeConfig diag-common2.conf + +$ModLoad ../plugins/imtcp/.libs/imtcp +# then SENDER sends to this port (not tcpflood!) +$InputTCPServerRun 13515 + +$template outfmt,"%msg:F,58:2%\n" +:msg, contains, "msgnum:" ./rsyslog.out.log;outfmt diff --git a/tests/testsuites/rcvr_fail_restore_sender.conf b/tests/testsuites/rcvr_fail_restore_sender.conf new file mode 100644 index 0000000..6b11aa4 --- /dev/null +++ b/tests/testsuites/rcvr_fail_restore_sender.conf @@ -0,0 +1,15 @@ +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/imtcp/.libs/imtcp +# this listener is for message generation by the test framework! +$InputTCPServerRun 13514 + +$WorkDirectory test-spool +$MainMsgQueueMaxFileSize 1g +$MainMsgQueueFileName mainq + +# we use the shortest resume interval a) to let the test not run too long +# and b) make sure some retries happen before the reconnect +$ActionResumeInterval 1 +$ActionResumeRetryCount -1 +*.* @@127.0.0.1:13515 |