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

[exim.git] / test / stdout / 5700

diff --git a/test/stdout/5700 b/test/stdout/5700
index b185dca05916d0263127676a8af8b8b75bdd56a2..98ba767c1c4935b9a60052677f85e1f9c6a47cff 100644 (file)
--- a/test/stdout/5700
+++ b/test/stdout/5700
@@ -1,3 +1,6 @@
+Message 10HmbE-0005vi-00 has been removed
+Message 10HmbF-0005vi-00 has been modified
+Message 10HmbF-0005vi-00 has been removed
 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -6,7 +9,7 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
 250 OK
 RCPT TO:<userx@domain1>
 250 OK
@@ -32,16 +35,16 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
 250 OK
-RCPT TO:<userx@domain2>
+RCPT TO:<userx@expansionfail>
 250 OK
 DATA
 354 More...
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
-       for userx@domain2; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@expansionfail; Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -64,7 +67,20 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
+250 OK
+RCPT TO:<userx@domain1>
+450 NOT RIGHT NOW
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>
 250 OK
 RCPT TO:<userx@domain1>
 550 GO AWAY