X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cc5a3f43827026193110cb663151a95eac4ee379..114b01dded2c9d72cdd44cac97a4d3cc9f22ddfd:/test/stderr/0374 diff --git a/test/stderr/0374 b/test/stderr/0374 index c8163712a..dc55b780a 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -1,11 +1,6 @@ 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 @@ -13,11 +8,7 @@ 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 +dropping to exim gid; retaining priv uid locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -68,7 +59,7 @@ set transport ut4 queued for ut4 transport: local_part = d3 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^d\d routed by ut4 router (unseen) envelope to: d3@myhost.test.ex transport: ut4 @@ -96,7 +87,7 @@ ut4 router called for d2@myhost.test.ex queued for ut4 transport: local_part = d2 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^d\d routed by ut4 router (unseen) envelope to: d2@myhost.test.ex transport: ut4 @@ -124,7 +115,7 @@ ut4 router called for d1@myhost.test.ex queued for ut4 transport: local_part = d1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^d\d routed by ut4 router (unseen) envelope to: d1@myhost.test.ex transport: ut4 @@ -149,7 +140,7 @@ set transport ut3 queued for ut3 transport: local_part = c1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^c\d routed by ut3 router (unseen) envelope to: c1@myhost.test.ex transport: ut3 @@ -170,7 +161,7 @@ set transport ut2 queued for ut2 transport: local_part = b1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^b\d routed by ut2 router (unseen) envelope to: b1@myhost.test.ex transport: ut2 @@ -187,7 +178,7 @@ set transport ut1 queued for ut1 transport: local_part = a1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=^a\d routed by u1 router (unseen) envelope to: a1@myhost.test.ex transport: ut1 @@ -229,7 +220,7 @@ set transport real queued for real transport: local_part = d3 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: d3@myhost.test.ex transport: real @@ -243,7 +234,7 @@ real router called for d2@myhost.test.ex queued for real transport: local_part = d2 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: d2@myhost.test.ex transport: real @@ -257,7 +248,7 @@ real router called for d1@myhost.test.ex queued for real transport: local_part = d1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: d1@myhost.test.ex transport: real @@ -275,7 +266,7 @@ real router called for c1@myhost.test.ex queued for real transport: local_part = c1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: c1@myhost.test.ex transport: real @@ -297,7 +288,7 @@ real router called for b1@myhost.test.ex queued for real transport: local_part = b1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: b1@myhost.test.ex transport: real @@ -323,7 +314,7 @@ real router called for a1@myhost.test.ex queued for real transport: local_part = a1 domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: a1@myhost.test.ex transport: real @@ -376,13 +367,16 @@ LOG: MAIN == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +cmdlog: '220' LOG: MAIN => 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 +cmdlog: '220' LOG: MAIN == 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:: 450 soft error locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +cmdlog: '220' LOG: MAIN ** 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:: 550 hard error locking TESTSUITE/spool/db/retry.lockfile @@ -390,22 +384,13 @@ 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 + <= <> R=10HmaX-000000005vi-0000 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 +dropping to exim gid; retaining priv uid locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@myhost.test.ex @@ -438,7 +423,7 @@ set transport real queued for real transport: local_part = CALLER domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by real router envelope to: CALLER@myhost.test.ex transport: real @@ -454,7 +439,7 @@ LOG: MAIN => CALLER R=real T=real LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>