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 a3cb9ef5fc69a600a645a8ad8842c30e5eebb0c3..ce255a7443ca4c274d365117c63cacab9be92e38 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -1,11 +1,12 @@
-> 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_size=407
 > 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
@@ -14,10 +15,9 @@
 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
+> from: Himself <himself@there.tld>
+> subject: The subject is not the object
 > message_body_size=76
-> message_size=416
 > message_id=10HmaY-0005vi-00
 > message_exim_id=10HmaY-0005vi-00
 > max_received_linelength=75
@@ -26,7 +26,6 @@
 > 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_exim_id=10HmaZ-0005vi-00
 > message_linecount=6