Testsuite: more diag info if initial Exim startup fails

[users/jgh/exim.git] / test / rejectlog / 4002

diff --git a/test/rejectlog/4002 b/test/rejectlog/4002
index 2054abdb0dcb14108c4151d99397bab524585922..16c70898603fd73bd88c3c2dff28cf624d0fe8ee 100644 (file)
--- a/test/rejectlog/4002
+++ b/test/rejectlog/4002
@@ -7,10 +7,22 @@ P Received: from CALLER (helo=test.ex)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-  Subject: defer this one
+  Subject: defer this one (daemon tmp-err)
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA
+1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA
+Envelope-from: <CALLER@myhost.test.ex>
+Envelope-to: <userx@test.ex>
+P Received: from CALLER (helo=test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)
+       (envelope-from <CALLER@myhost.test.ex>)
+       id 10HmbB-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+  Subject: message should be rejected (virus found)
+I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+F From: CALLER_NAME <CALLER@myhost.test.ex>
+1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER (helo=test.ex)
@@ -19,6 +31,18 @@ P Received: from CALLER (helo=test.ex)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-  Subject: message should be rejected
+  Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
+1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA
+Envelope-from: <CALLER@myhost.test.ex>
+Envelope-to: <userx@test.ex>
+P Received: from CALLER (helo=test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)
+       (envelope-from <CALLER@myhost.test.ex>)
+       id 10HmbC-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+  Subject: message should be rejected (virus found)
+I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+F From: CALLER_NAME <CALLER@myhost.test.ex>