Testsuite: rework testcases for DSN RCPT options

[exim.git] / test / stderr / 0554

diff --git a/test/stderr/0554 b/test/stderr/0554
index 17e8f4da419e8bc81e4bb88250412d8a1f819336..bbb76dbd471843324a6d48fb9c2125585258b0b0 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -21,20 +21,20 @@ added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A fl
 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN
-  == x@y R=r1 T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == x@y R=r1 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:
-x@y
+ x@y
 locking TESTSUITE/spool/db/retry.lockfile
 retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:x@y:<CALLER@myhost.test.ex>
   first failed=dddd last try=dddd next try=+1 expired=0
-  errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -78,7 +78,7 @@ LOG: MAIN
   => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 Processing retry items
 Succeeded addresses:
-x@y
+ x@y
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:x@y:<CALLER@myhost.test.ex>
 deleted retry information for R:x@y
@@ -88,4 +88,4 @@ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>