Fix ${tr...} and empty-strings. Bug 3023

[exim.git] / test / log / 4008

diff --git a/test/log/4008 b/test/log/4008
index d8bbb9b183eed91d0f9f079cffc289abae20b12c..3ae380a50db958e617d84393b3bf81928b15b112 100644 (file)
--- a/test/log/4008
+++ b/test/log/4008
@@ -1,4 +1,11 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER Warning: reject Action: reject\n Symbol: FAKE_SYMBOL_A(15.00)\n Symbol: FAKE_SYMBOL_B(0.00)\n Message-ID: undef
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=r
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => :blackhole: <userx@test.ex> R=r
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 malware_name VNAME
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: cmdline  : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaX-000000005vi-0000 2>&1): Connection timed out
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: cmdline  : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaY-000000005vi-0000 2>&1): Connection timed out
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted despite a timeout"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => :blackhole: <userx@test.ex> R=r
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed