Send delay-MDN for any queurun past delay_warning, even if not retry time yet. Bug...

[users/jgh/exim.git] / test / stderr / 0303

diff --git a/test/stderr/0303 b/test/stderr/0303
index 598ed62ed2bf545ab11c3603b10335f3ebf7288c..2b2df1ae9fc3fc632f2e37fbe6e105b5bd82b6fa 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -77,6 +77,8 @@ SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"


@@ -99,8 +101,6 @@ P Received: from [V4NET.2.3.4]
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00


@@ -110,7 +110,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -151,6 +151,8 @@ SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<>

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"


@@ -173,8 +175,6 @@ P Received: from host.name.tld ([V4NET.2.3.4])
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00


@@ -184,4 +184,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>