diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-19 19:13:58 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-19 19:13:58 +0100 |
| commit | 35deab6a4e72f25219fa7989be018f39f46a2276 (patch) | |
| tree | 47daa1e3e46d80d58af6e51be2646ce9010cd75a /test/scripts | |
| parent | b8fc75b3728d523ae83d02de92e1cfb002d25c9d (diff) | |
Testsuite: fix content-scanner interface tests
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/4000-scanning/4008 | 9 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4009 | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/test/scripts/4000-scanning/4008 b/test/scripts/4000-scanning/4008 index c44b93854..703a7c2aa 100644 --- 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
<Content-length: @@ -17,9 +22,10 @@ server 11333 < (envelope < id < for +<From: <Content-type: text/plain <Message-Id: -<From: +<Sender: <Date: < <test @@ -36,6 +42,7 @@ ehlo test.ex mail from:<> rcpt to:<userx@test.ex> data +From: MAILER_DAEMON <> Content-type: text/plain test diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009 index 9c72a8222..0fb96ac16 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 |