diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-30 11:19:22 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-30 11:19:22 +0200 |
commit | b59f8fd65d4f464ce3673439725db1606ec31329 (patch) | |
tree | c088eff1b782635bd43a061a0e7c340494e10a77 /tests/testsuites | |
parent | 5bfa8d2a254e0ead0608b954bdab6dd2a7d9f3e0 (diff) | |
download | rsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.tar.gz rsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.tar.xz rsyslog-b59f8fd65d4f464ce3673439725db1606ec31329.zip |
fixed problem in testbench & added new test (not yet integrated)
The test is a setup scenario for this bug tracker:
http://bugzilla.adiscon.com/show_bug.cgi?id=241
Diffstat (limited to 'tests/testsuites')
-rw-r--r-- | tests/testsuites/diag-common.conf | 5 | ||||
-rw-r--r-- | tests/testsuites/rcvr_fail_restore_rcvr.conf | 8 | ||||
-rw-r--r-- | tests/testsuites/rcvr_fail_restore_sender.conf | 15 |
3 files changed, 27 insertions, 1 deletions
diff --git a/tests/testsuites/diag-common.conf b/tests/testsuites/diag-common.conf index 9e9e28fe..d76e2d15 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/rcvr_fail_restore_rcvr.conf b/tests/testsuites/rcvr_fail_restore_rcvr.conf new file mode 100644 index 00000000..38ebad29 --- /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 00000000..6b11aa4a --- /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 |