Testsuite: fix 0173 + 2100+, take 2

[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..e5a7c949237fc7c155ef75ffbea096059b3c02c1 100644 (file)
--- a/test/scripts/4000-scanning/4008
+++ b/test/scripts/4000-scanning/4008
@@ -1,33 +1,40 @@
 # content scan interface: rspamd
 # 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
 server 11333

-<CHECK RSPAMC/1.3\r
-<Content-length: 
-<Queue-Id: 
-<From: 
-<Recipient-Number: 1\r
-<Rcpt: 
+<CHECK RSPAMC/1.3
+<Content-length:
+<Queue-Id:
+<From:
+<Recipient-Number: 1
+<Rcpt:

 <Helo:
 <Helo:

-<\r
-<From 
+<User:
+<
+<From

 <X-Envelope-From
 <X-Envelope-To
 <X-Envelope-From
 <X-Envelope-To

-<Received: 
-<      by 
+<Received:
+<      by

 <      (envelope
 <      (envelope

-<      id 
-<      for 
+<      id
+<      for
+<From:

 <Content-type: text/plain
 <Message-Id:
 <Content-type: text/plain
 <Message-Id:

-<From:
+<Sender:

 <Date:
 <
 <test
 <Date:
 <
 <test

->RSPAMD/1.3 0 EX_OK\r
->Metric: default; True; 15.00 / 15.00 / 0.0\r
->Action: reject\r
->Symbol: FAKE_SYMBOL_A(15.00)\r
->Symbol: FAKE_SYMBOL_B(0.00)\r
->Message-ID: undef\r
+>RSPAMD/1.3 0 EX_OK
+>Metric: default; True; 15.00 / 15.00 / 0.0
+>Action: reject
+>Symbol: FAKE_SYMBOL_A(15.00)
+>Symbol: FAKE_SYMBOL_B(0.00)
+>Message-ID: undef

 *eof
 ****
 exim -odi -bs
 *eof
 ****
 exim -odi -bs


@@ -35,6 +42,7 @@ ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data

+From: MAILER_DAEMON <>

 Content-type: text/plain
 
 test
 Content-type: text/plain
 
 test