git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Capture substrings in ACL regex= . Bug 425.
[users/jgh/exim.git]
/
test
/
scripts
/
4000-scanning
/
4008
diff --git
a/test/scripts/4000-scanning/4008
b/test/scripts/4000-scanning/4008
index c44b93854d07d4163653e37fbe30950c4bfe083c..703a7c2aa08faee4f179b745dadc4be81b77d259 100644
(file)
--- a/
test/scripts/4000-scanning/4008
+++ b/
test/scripts/4000-scanning/4008
@@
-1,4
+1,9
@@
# 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
<CHECK RSPAMC/1.3
\r
<Content-length:
server 11333
<CHECK RSPAMC/1.3
\r
<Content-length:
@@
-17,9
+22,10
@@
server 11333
< (envelope
< id
< for
< (envelope
< id
< for
+<From:
<Content-type: text/plain
<Message-Id:
<Content-type: text/plain
<Message-Id:
-<
From
:
+<
Sender
:
<Date:
<
<test
<Date:
<
<test
@@
-36,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