X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a108e3eae2841ec938041460bcb201e15131c17f..55dc330bf277fe511858246f11ccd017f82e6aff:/test/scripts/4000-scanning/4009

diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009
index 9c72a8222..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
 <User:
 <Content-length:
 <
-<From 
+<From
 <X-Envelope-From
 <X-Envelope-To
-<Received: 
-<	by 
+<Received:
+<	by
 <	(envelope
-<	id 
-<	for 
+<	id
+<	for
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -30,7 +35,7 @@ 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:<fromuser@myhost.test.ex>
 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain
@@ -67,14 +72,14 @@ server 7833
 <User:
 <Content-length:
 <
-<From 
+<From
 <X-Envelope-From
 <X-Envelope-To
-<Received: 
-<	by 
+<Received:
+<	by
 <	(envelope
-<	id 
-<	for 
+<	id
+<	for
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -90,7 +95,7 @@ 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:<fromuser@myhost.test.ex>
 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain
@@ -125,14 +130,14 @@ server -i 2 7833
 <User:
 <Content-length:
 <
-<From 
+<From
 <X-Envelope-From
 <X-Envelope-To
-<Received: 
-<	by 
+<Received:
+<	by
 <	(envelope
-<	id 
-<	for 
+<	id
+<	for
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -148,7 +153,7 @@ 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:<fromuser@myhost.test.ex>
 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain
@@ -184,14 +189,14 @@ server 7833
 <User:
 <Content-length:
 <
-<From 
+<From
 <X-Envelope-From
 <X-Envelope-To
-<Received: 
-<	by 
+<Received:
+<	by
 <	(envelope
-<	id 
-<	for 
+<	id
+<	for
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -207,7 +212,7 @@ 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 ; 127.0.0.2 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:<fromuser@myhost.test.ex>
 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain