From b83823bd386eb32cd37b8087429ff58fd21d0f2e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 22 Sep 2015 11:30:11 +0100 Subject: Testsuite: move regex testcase to Content-scanning section --- test/scripts/0000-Basic/0568 | 38 ----------------------- test/scripts/4000-scanning/4010 | 38 +++++++++++++++++++++++ test/scripts/4010-scan-ipv6/4010 | 60 ------------------------------------ test/scripts/4010-scan-ipv6/REQUIRES | 2 -- test/scripts/4015-scan-ipv6/4015 | 60 ++++++++++++++++++++++++++++++++++++ test/scripts/4015-scan-ipv6/REQUIRES | 2 ++ 6 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 test/scripts/0000-Basic/0568 create mode 100644 test/scripts/4000-scanning/4010 delete mode 100644 test/scripts/4010-scan-ipv6/4010 delete mode 100644 test/scripts/4010-scan-ipv6/REQUIRES create mode 100644 test/scripts/4015-scan-ipv6/4015 create mode 100644 test/scripts/4015-scan-ipv6/REQUIRES (limited to 'test/scripts') diff --git a/test/scripts/0000-Basic/0568 b/test/scripts/0000-Basic/0568 deleted file mode 100644 index a660f6805..000000000 --- a/test/scripts/0000-Basic/0568 +++ /dev/null @@ -1,38 +0,0 @@ -# ACL regex= test -# -# These tests are copies from testcase 4000; -# they should be removed from there but I don't -# run spamassassin so can't verify the change. -# -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> - -OK, this should look like a genuine message. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeReject: test fakereject - -OK, this should look like a genuine message, but -it will trip on THIS gazornenplaz REGEX. -. -quit -**** diff --git a/test/scripts/4000-scanning/4010 b/test/scripts/4000-scanning/4010 new file mode 100644 index 000000000..a660f6805 --- /dev/null +++ b/test/scripts/4000-scanning/4010 @@ -0,0 +1,38 @@ +# ACL regex= test +# +# These tests are copies from testcase 4000; +# they should be removed from there but I don't +# run spamassassin so can't verify the change. +# +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> + +OK, this should look like a genuine message. +. +quit +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeReject: test fakereject + +OK, this should look like a genuine message, but +it will trip on THIS gazornenplaz REGEX. +. +quit +**** diff --git a/test/scripts/4010-scan-ipv6/4010 b/test/scripts/4010-scan-ipv6/4010 deleted file mode 100644 index 66db933e6..000000000 --- a/test/scripts/4010-scan-ipv6/4010 +++ /dev/null @@ -1,60 +0,0 @@ -# content scan interface: spamassassin / ipv6 -# -# Multiple servers, prioritised, with timeout spec; first one fails -# List separator changed -server 7833 -SPAMD/1.1 0 EX_OK ->Spam: False ; 4.5 / 5.0 -> ->Spam detection software, running on the system "demo", ->has NOT identified this incoming email as spam. The original ->message has been attached to this so you can view it or label ->similar future email. If you have any questions, see ->@@CONTACT_ADDRESS@@ for details. -> ->Content preview: test [...] -> ->Content analysis details: (4.5 points, 5.0 required) -> -> pts rule name description ->---- ---------------------- -------------------------------------------------- ->-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -> 1.2 MISSING_HEADERS Missing To: header -> 1.0 MISSING_FROM Missing From: header -> 1.8 MISSING_SUBJECT Missing Subject: header -> 1.4 MISSING_DATE Missing Date: header -> 0.1 MISSING_MID Missing Message-Id: header -> -*eof -**** -exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s' -ehlo test.ex -mail from:<> -rcpt to: -data -Content-type: text/plain - -test -. -quit -**** -# -# diff --git a/test/scripts/4010-scan-ipv6/REQUIRES b/test/scripts/4010-scan-ipv6/REQUIRES deleted file mode 100644 index 927190137..000000000 --- a/test/scripts/4010-scan-ipv6/REQUIRES +++ /dev/null @@ -1,2 +0,0 @@ -support Content_Scanning -support IPv6 diff --git a/test/scripts/4015-scan-ipv6/4015 b/test/scripts/4015-scan-ipv6/4015 new file mode 100644 index 000000000..66db933e6 --- /dev/null +++ b/test/scripts/4015-scan-ipv6/4015 @@ -0,0 +1,60 @@ +# content scan interface: spamassassin / ipv6 +# +# Multiple servers, prioritised, with timeout spec; first one fails +# List separator changed +server 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> +*eof +**** +exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s' +ehlo test.ex +mail from:<> +rcpt to: +data +Content-type: text/plain + +test +. +quit +**** +# +# diff --git a/test/scripts/4015-scan-ipv6/REQUIRES b/test/scripts/4015-scan-ipv6/REQUIRES new file mode 100644 index 000000000..927190137 --- /dev/null +++ b/test/scripts/4015-scan-ipv6/REQUIRES @@ -0,0 +1,2 @@ +support Content_Scanning +support IPv6 -- cgit v1.2.3