diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 15:04:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 15:04:03 +0200 |
commit | 55639bd99d5c33b1ee9daa4ffa8597af9ec334bb (patch) | |
tree | 4e99e905cb1c123bb71cf04d0fdede90bc1f8ef0 | |
parent | 46ac70bb3073295f70bdddc8359d056bc0651909 (diff) | |
parent | e3b469befafe9fa55413eb8a7df35c120670c9bf (diff) | |
download | rsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.tar.gz rsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.tar.xz rsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.zip |
Merge branch 'v4-stable' into v4-stable-solaris
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | tests/testsuites/parse3.conf | 4 | ||||
-rw-r--r-- | tests/testsuites/parse_invld_regex.conf | 4 | ||||
-rw-r--r-- | tests/testsuites/reallife.parse3 | 4 | ||||
-rw-r--r-- | tests/testsuites/samples.parse_invld_regex | 2 |
5 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,6 @@ +- bugfix: testbench failed when not executed in UTC+1 timezone + accidently, the time zone information was kept inside some + to-be-checked-for responses --------------------------------------------------------------------------- Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? - bugfix: local unix system log socket was deleted even when it was diff --git a/tests/testsuites/parse3.conf b/tests/testsuites/parse3.conf index d5cf77d9..8a3cb317 100644 --- a/tests/testsuites/parse3.conf +++ b/tests/testsuites/parse3.conf @@ -1,8 +1,10 @@ +# note: we need to strip off the TZ designator in the rfc3339 timestamp +# as this test otherwise fails in different timezones! $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" +$Template output,"%timereported:1:19: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/parse_invld_regex.conf b/tests/testsuites/parse_invld_regex.conf index 736aae59..d18a2b3c 100644 --- a/tests/testsuites/parse_invld_regex.conf +++ b/tests/testsuites/parse_invld_regex.conf @@ -1,8 +1,10 @@ +# note: we need to strip off the TZ designator in the rfc3339 timestamp +# as this test otherwise fails in different timezones! $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" +$Template output,"%timereported:1:19: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 index 465635bd..dad3f56e 100644 --- a/tests/testsuites/reallife.parse3 +++ b/tests/testsuites/reallife.parse3 @@ -9,7 +9,7 @@ # 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" +"2009-10-16T23:47:31", "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" +"2009-10-16T23:47:31", "hostname", "tag", "1234", "7", " This is a message" diff --git a/tests/testsuites/samples.parse_invld_regex b/tests/testsuites/samples.parse_invld_regex index 9ac2c3aa..0d0e4ce3 100644 --- a/tests/testsuites/samples.parse_invld_regex +++ b/tests/testsuites/samples.parse_invld_regex @@ -13,4 +13,4 @@ # configured format. # rgerhards, 2010-02-08 <175>Feb 08 2008 23:47:31 hostname tag This is a message -"2008-02-08T23:47:31+01:00", "hostname", "tag", **NO MATCH** **BAD REGULAR EXPRESSION**, "7", " This is a message" +"2008-02-08T23:47:31", "hostname", "tag", **NO MATCH** **BAD REGULAR EXPRESSION**, "7", " This is a message" |