Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

[users/heiko/exim.git] / test / scripts / 4000-scanning / 4008

diff --git a/test/scripts/4000-scanning/4008 b/test/scripts/4000-scanning/4008
index 30c1d94d060f224f6f11b30a2ec669ab48c58570..703a7c2aa08faee4f179b745dadc4be81b77d259 100644 (file)
--- a/test/scripts/4000-scanning/4008
+++ b/test/scripts/4000-scanning/4008
@@ -1,4 +1,9 @@
 # content scan interface: rspamd
+#
+# The spooled file for scanning includes the test-runner's user name
+# hence size varies.  Munge that.
+munge scanfile_size
+#
 server 11333
 <CHECK RSPAMC/1.3\r
 <Content-length: 
@@ -7,6 +12,7 @@ server 11333
 <Recipient-Number: 1\r
 <Rcpt: 
 <Helo:
+<User:
 <\r
 <From 
 <X-Envelope-From
@@ -16,9 +22,10 @@ server 11333
 <      (envelope
 <      id 
 <      for 
+<From:
 <Content-type: text/plain
 <Message-Id:
-<From:
+<Sender:
 <Date:
 <
 <test
@@ -35,6 +42,7 @@ ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data
+From: MAILER_DAEMON <>
 Content-type: text/plain
 
 test