diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-08 17:28:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-08 17:28:58 +0100 |
| commit | eff5630ec0944b9fe10a50be7f236ac714807be7 (patch) | |
| tree | 54f9845969bb11c80037c883f2b2ce7b89a677ac | |
| parent | e1584b71f316b9ef2db58c8dbd2218f0b38962e7 (diff) | |
| download | rsyslog-eff5630ec0944b9fe10a50be7f236ac714807be7.tar.gz rsyslog-eff5630ec0944b9fe10a50be7f236ac714807be7.tar.xz rsyslog-eff5630ec0944b9fe10a50be7f236ac714807be7.zip | |
enhanced test suite
now CSV and regex extraction are being tested (would have caught the
bug fixed with the last commit).
| -rwxr-xr-x | tests/parsertest.sh | 12 | ||||
| -rw-r--r-- | tests/testsuites/parse3.conf | 8 | ||||
| -rw-r--r-- | tests/testsuites/reallife.parse3 | 15 |
3 files changed, 33 insertions, 2 deletions
diff --git a/tests/parsertest.sh b/tests/parsertest.sh index ef33256e..e0d35218 100755 --- a/tests/parsertest.sh +++ b/tests/parsertest.sh @@ -1,5 +1,13 @@ -echo TEST: parsertest.sh - various parser tests +echo TEST: \[parsertest.sh\]: various parser tests source $srcdir/diag.sh init source $srcdir/diag.sh nettester parse1 udp source $srcdir/diag.sh nettester parse1 tcp -source $srcdir/diag.sh init +source $srcdir/diag.sh nettester parse3 udp +source $srcdir/diag.sh nettester parse3 tcp + +echo \[parsertest.sh]: redoing tests in IPv4-only mode +source $srcdir/diag.sh nettester parse1 udp -4 +source $srcdir/diag.sh nettester parse1 tcp -4 +source $srcdir/diag.sh nettester parse3 udp -4 +source $srcdir/diag.sh nettester parse3 tcp -4 +source $srcdir/diag.sh exit diff --git a/tests/testsuites/parse3.conf b/tests/testsuites/parse3.conf new file mode 100644 index 00000000..d5cf77d9 --- /dev/null +++ b/tests/testsuites/parse3.conf @@ -0,0 +1,8 @@ +$ModLoad ../plugins/omstdout/.libs/omstdout +$IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver! + +$ErrorMessagesToStderr off + +# use a special format that we can easily parse in expect +$Template output,"%timereported:1:$:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9]+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n" +*.* :omstdout:;output diff --git a/tests/testsuites/reallife.parse3 b/tests/testsuites/reallife.parse3 new file mode 100644 index 00000000..465635bd --- /dev/null +++ b/tests/testsuites/reallife.parse3 @@ -0,0 +1,15 @@ +# New tests should be added to this file if there is no specific +# reason for not doing that. Initially, we could only handle one test +# case per file, but this restriction has been removed some time ago. +# So it is less troublesome (and easier to overlook) to have all related +# tests in a single file. +# This file contains a lot of real-life samples (of course mangled so +# that they can not be traced back to the original submitter). Note +# that IP addr 192.0.2.1 is specifically set aside for testing and +# documentation by IANA. +# rgerhards, 2009-10-19 +<175>Oct 16 2009 23:47:31 hostname tag This is a message +"2009-10-16T23:47:31+01:00", "hostname", "tag", "", "7", " This is a message" +# +<175>Oct 16 2009 23:47:31 hostname tag[1234] This is a message +"2009-10-16T23:47:31+01:00", "hostname", "tag", "1234", "7", " This is a message" |