X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0f0c8159c43045f4ad847a0129dca7eddd313285..8d3dc2397dd769bf4654b0678be8d2acf0956ddd:/test/scripts/4000-scanning/4003 diff --git a/test/scripts/4000-scanning/4003 b/test/scripts/4000-scanning/4003 index 49d331bf1..e5a7c9492 100644 --- a/test/scripts/4000-scanning/4003 +++ b/test/scripts/4000-scanning/4003 @@ -1,134 +1,51 @@ -# content scan interface: fsecure -# also testing alternate list separator for malware= args -# -server DIR/eximdir/fsec_sock -ignored_response -ignored_response -ignored_response -ignored_response -LF>random ignored line ->LF>random ignored line 2 ->LF>OK Scan ok. -*eof -**** -# -# -# -exim -odi -bs -DOPT= -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be accepted - -. -quit -**** -# -# -# -server DIR/eximdir/fsec_sock -ignored_response -ignored_response -ignored_response -ignored_response -LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. -*eof -**** -# -# -# -exim -odi -bs -DOPT= -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be rejected - -. -quit -**** -# -# -# -server DIR/eximdir/fsec_sock -*sleep 3 -**** -# -# -# -exim -odi -bs -DOPT=";tmo=2s" -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be tmp-rejected due to timeout - -. -quit -**** -# -# -# -server DIR/eximdir/fsec_sock -*sleep 3 -**** -# -# -# -exim -odi -bs -DOPT=";defer_ok;tmo=2s" -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be accepted despite timeout - -. -quit -**** -# -# -# -server DIR/eximdir/fsec_sock -ignored_response -ignored_response -ignored_response -ignored_response -LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. +# 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 +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 -DOPT="; defer_ok ; tmo=5h" +exim -odi -bs ehlo test.ex mail from:<> rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be rejected as the options are not relevant +From: MAILER_DAEMON <> +Content-type: text/plain +test . quit ****