Events: Fire msg:fail:delivery event even when error is being ignored. Bug 2314

[exim.git] / test / stdout / 0542

diff --git a/test/stdout/0542 b/test/stdout/0542
index 3e42bc19dfee4eed582cef351dcea8fc99c81180..ce255a7443ca4c274d365117c63cacab9be92e38 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -1,18 +1,33 @@
-> From: Himself <himself@there.tld>
-> Subject: The subject is not the object
+> from: Himself <himself@there.tld>
+> subject: The subject is not the object

 > message_body_size=71
 > message_body_size=71

-> message_size=407

 > message_id=10HmaX-0005vi-00
 > message_exim_id=10HmaX-0005vi-00
 > max_received_linelength=70
 > recipients=userx@test.x, usery@test.ex
 > message_id=10HmaX-0005vi-00
 > message_exim_id=10HmaX-0005vi-00
 > max_received_linelength=70
 > recipients=userx@test.x, usery@test.ex

+> Defined macro 'TESTING_MACROS'
+> (userx@test.x, usery@test.ex)
+> 
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaY-0005vi-00\r
+221 myhost.test.ex closing connection\r
+> from: Himself <himself@there.tld>
+> subject: The subject is not the object
+> message_body_size=76
+> message_id=10HmaY-0005vi-00
+> message_exim_id=10HmaY-0005vi-00
+> max_received_linelength=75
+> recipients=userx@test.x, usery@test.ex

 > 
 > from: A Person <a.person@a.domain.tld>
 > to: First <first@test.ex>, Second <second@test.ex>
 > subject: The subject is moot
 > 
 > from: A Person <a.person@a.domain.tld>
 > to: First <first@test.ex>, Second <second@test.ex>
 > subject: The subject is moot

-> message_size=197

 > message_body_size=77
 > message_body_size=77

-> message_exim_id=10HmaY-0005vi-00
+> message_exim_id=10HmaZ-0005vi-00

 > message_linecount=6
 > message_body_linecount=2
 > max_received_linelength=50
 > message_linecount=6
 > message_body_linecount=2
 > max_received_linelength=50


@@ -20,7 +35,7 @@
 > From: A Person <a.person@a.domain.tld>
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot
 > From: A Person <a.person@a.domain.tld>
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 > 
 > body --------------------
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 > 
 > body --------------------