X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/a60f6c07eea74e79b88828295a191e79595d8960..0d28287ca56d1545b8e2fdeab6616a674e633236:/test/scripts/4000-scanning/4002?ds=sidebyside diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002 index 201fdf197..4754609c0 100644 --- a/test/scripts/4000-scanning/4002 +++ b/test/scripts/4000-scanning/4002 @@ -11,7 +11,7 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to: @@ -36,13 +36,13 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to: data Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: defer this one +Subject: defer this one (daemon tmp-err) . quit @@ -62,13 +62,106 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +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 +Subject: message should be rejected (virus found) + +. +quit +**** +# +# +# +server DIR/eximdir/aveserver_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 deferred due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/aveserver_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/tmo=2s / defer_ok" +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/aveserver_sock +>2xx ready +5xx defer +2xx ready +*eof +**** +# +# +# +exim -odi -bs -DOPT=" / defer_ok" +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: accept this, overriding the scan daemon temp-error + +. +quit +**** +# +# +# +# Recheck that defer_ok option does not affect a malware detection +# +server DIR/eximdir/aveserver_sock +>2xx ready +322 VNAME found +>2xx ready +2xx ready +*eof +**** +# +# +# +exim -odi -bs -DOPT="/defer_ok" +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be rejected (virus found) . quit