Callouts: fix recipient verify/random

[exim.git] / test / stderr / 0374

diff --git a/test/stderr/0374 b/test/stderr/0374
index 641156ca016438da35459cd9811b0989b141673f..c8163712aa8886bc84efb469548db45a9ed26c17 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -1,6 +1,11 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log


@@ -8,6 +13,11 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -367,26 +377,35 @@ LOG: MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN

-  => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]
+  => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/retry.lockfile

-locking TESTSUITE/spool/db/wait-ut4.lockfile

 LOG: MAIN
 LOG: MAIN

-  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN

-  ** d3@myhost.test.ex R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error

 locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN

 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex