nicer retry message

[users/heiko/exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index 533fc0d3b3efa7ce6afa10caaf84952c8eaffbee..6a7aebe15430c3dbdd371d8a8ab83a7ca9a5eaa2 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -14,7 +14,6 @@
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
@@ -31,6 +30,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -73,7 +73,6 @@ routed by r1 router
   transport: t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
-fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 get[host|ipnode]byname[2] looked up these IP addresses:
   name=127.0.0.1 address=127.0.0.1
@@ -84,11 +83,11 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=y
-callout cache: no domain record found
+callout cache: no domain record found for y
 dbfn_read: key=x@y
-callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+callout cache: no address record found for x@y
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -127,6 +126,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -169,7 +169,6 @@ routed by r1 router
   transport: t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
-fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 get[host|ipnode]byname[2] looked up these IP addresses:
   name=127.0.0.1 address=127.0.0.1
@@ -180,9 +179,9 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=y
-callout cache: found domain record
+callout cache: found domain record for y
 dbfn_read: key=x@y
-callout cache: found address record
+callout cache: found address record for x@y
 callout cache: address record is positive
 ----------- end verify ------------
 sender x@y verified ok
@@ -211,13 +210,12 @@ search_tidyup called
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
 >>> Attempting full verification using callout
->>> callout cache: found domain record
->>> callout cache: found address record
+>>> callout cache: found domain record for y
+>>> callout cache: found address record for x@y
 >>> callout cache: address record is positive
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "mail"
@@ -238,15 +236,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
 >>> Attempting full verification using callout
->>> callout cache: no domain record found
->>> callout cache: no address record found
->>> interface=127.0.0.1 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+>>> callout cache: no domain record found for b
+>>> callout cache: no address record found for a@b
+>>> interface=NULL port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
@@ -279,15 +276,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> calling r1 router
 >>> routed by r1 router
 >>> local host found for non-MX address
->>> fully qualified name = 127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=127.0.0.1 address=127.0.0.1
 >>> Attempting full verification using callout
->>> callout cache: no domain record found
->>> callout cache: no address record found
->>> interface=127.0.0.1 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+>>> callout cache: no domain record found for q
+>>> callout cache: no address record found for p1@q
+>>> interface=NULL port=1224
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex