X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/dc7b3d368017727e9438fc7463b0841df1e4aa41..fd047340363431f15d2b0ac686b9dba4fa125781:/test/scripts/4000-scanning/4009?ds=inline diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009 index 50f5ff990..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='127.0.0.1 7833 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,14 @@ server -i 2 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 +168,9 @@ server -i 2 7833 > *eof **** -exim -odi -bs -DOPT='127.0.0.1 7833 retry=4s' +exim -odi -oMt fromuser -bs -DOPT='127.0.0.1 7833 retry=4s' ehlo test.ex -mail from:<> +mail from: rcpt to: data Content-type: text/plain @@ -184,14 +189,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) > @@ -222,9 +227,9 @@ server 7833 > *eof **** -exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s' +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