X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0f0c8159c43045f4ad847a0129dca7eddd313285..0cedb352e62898761b701af0c400df8ae1989383:/test/scripts/4000-scanning/4002 diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002 index 4754609c0..a660f6805 100644 --- a/test/scripts/4000-scanning/4002 +++ b/test/scripts/4000-scanning/4002 @@ -1,168 +1,38 @@ -# content scan interface: aveserver -# -server DIR/eximdir/aveserver_sock ->200 ready -200 done -200 ready -*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/aveserver_sock ->2xx ready -5xx defer -2xx ready -*eof -**** -# -# -# -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 (daemon tmp-err) - -. -quit -**** -# -# -# -server DIR/eximdir/aveserver_sock ->2xx ready -322 VNAME found ->2xx ready -2xx ready -*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 (virus found) - -. -quit -**** +# ACL regex= test # +# These tests are copies from testcase 4000; +# they should be removed from there but I don't +# run spamassassin so can't verify the change. # -# -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" +exim -odi -bs ehlo test.ex mail from:<> rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be accepted despite timeout +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> +OK, this should look like a genuine message. . 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" +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 (virus found) +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeReject: test fakereject +OK, this should look like a genuine message, but +it will trip on THIS gazornenplaz REGEX. . quit ****