X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/8a512ed5b7f75c8aaedbca887257ee01e5c2b621..fd047340363431f15d2b0ac686b9dba4fa125781:/test/scripts/4000-scanning/4009?ds=sidebyside diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009 index 4c2ab81c6..d9849c341 100644 --- a/test/scripts/4000-scanning/4009 +++ b/test/scripts/4000-scanning/4009 @@ -1,5 +1,10 @@ # content scan interface: spamassassin # +# The spooled file for scanning includes the test-runner's user name +# hence size varies. Munge that. +munge scanfile_size +# +# # A good-comms test, returning not-spam. # (we could use a second one that returns is-spam...) server 7833 @@ -7,14 +12,14 @@ server 7833 similar future email. If you have any questions, see >@@CONTACT_ADDRESS@@ for details. > ->Content preview: test [...] +>Content preview: test [...] > >Content analysis details: (4.5 points, 5.0 required) > @@ -45,9 +50,9 @@ server 7833 > *eof **** -exim -odi -bs +exim -odi -oMt fromuser -bs ehlo test.ex -mail from:<> +mail from: rcpt to: data Content-type: text/plain @@ -67,14 +72,14 @@ server 7833 similar future email. If you have any questions, see >@@CONTACT_ADDRESS@@ for details. > ->Content preview: test [...] +>Content preview: test [...] > >Content analysis details: (4.5 points, 5.0 required) > @@ -105,9 +110,9 @@ server 7833 > *eof **** -exim -odi -bs -DOPT='retry=10s' +exim -odi -oMt fromuser -bs -DOPT='127.0.0.1 7833 retry=10s' ehlo test.ex -mail from:<> +mail from: rcpt to: data Content-type: text/plain @@ -125,14 +130,73 @@ server -i 2 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 -oMt fromuser -bs -DOPT='127.0.0.1 7833 retry=4s' +ehlo test.ex +mail from: +rcpt to: +data +Content-type: text/plain + +test +. +quit +**** +# +# +# +# Multiple servers, prioritised, with timeout spec; first one fails +# List separator changed +server 7833 +similar future email. If you have any questions, see >@@CONTACT_ADDRESS@@ for details. > ->Content preview: test [...] +>Content preview: test [...] > >Content analysis details: (4.5 points, 5.0 required) > @@ -163,9 +227,9 @@ server -i 2 7833 > *eof **** -exim -odi -bs -DOPT='retry=4s' +exim -odi -oMt fromuser -bs -DOPT='<; 127.0.0.1 7833 ; HOSTIPV4 7834 pri=2 tmo=2s' ehlo test.ex -mail from:<> +mail from: rcpt to: data Content-type: text/plain