diff options
Diffstat (limited to 'test/stderr')
| -rw-r--r-- | test/stderr/0357 | 3 | ||||
| -rw-r--r-- | test/stderr/0358 | 2 | ||||
| -rw-r--r-- | test/stderr/0374 | 1 | ||||
| -rw-r--r-- | test/stderr/0375 | 2 | ||||
| -rw-r--r-- | test/stderr/0388 | 7 | ||||
| -rw-r--r-- | test/stderr/0543 | 54 |
6 files changed, 54 insertions, 15 deletions
diff --git a/test/stderr/0357 b/test/stderr/0357 index f7bc3f635..7a6ee4d3b 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -25,7 +25,6 @@ checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -locking TESTSUITE/spool/db/wait-t1.lockfile reading retry information for R:userx@test.ex from subprocess added retry item LOG: MAIN @@ -67,7 +66,6 @@ locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -locking TESTSUITE/spool/db/wait-t1.lockfile reading retry information for R:userx@test.ex from subprocess existing delete item dropped added retry item @@ -117,7 +115,6 @@ locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -locking TESTSUITE/spool/db/wait-t1.lockfile reading retry information for R:userx@test.ex from subprocess existing delete item dropped added retry item diff --git a/test/stderr/0358 b/test/stderr/0358 index 2756de19a..40e38ca12 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -31,7 +31,6 @@ locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex: errno=-44 more_errno=dd,A flags=0 -locking TESTSUITE/spool/db/wait-t1.lockfile reading retry information for R:userx@test.ex from subprocess added retry item reading retry information for R:usery@test.ex from subprocess @@ -90,7 +89,6 @@ no host retry record no message retry record added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex: errno=-44 more_errno=dd,A flags=0 -locking TESTSUITE/spool/db/wait-t1.lockfile reading retry information for R:userx@test.ex from subprocess existing delete item dropped added retry item diff --git a/test/stderr/0374 b/test/stderr/0374 index 641156ca0..2fafefb7e 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -369,7 +369,6 @@ 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] locking TESTSUITE/spool/db/retry.lockfile -locking TESTSUITE/spool/db/wait-ut4.lockfile 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 locking TESTSUITE/spool/db/retry.lockfile diff --git a/test/stderr/0375 b/test/stderr/0375 index b780d95fd..628b5dfcb 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -805,7 +805,6 @@ LOG: MAIN => d1@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] log writing disabled locking TESTSUITE/spool/db/retry.lockfile -locking TESTSUITE/spool/db/wait-ut4.lockfile 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 log writing disabled @@ -825,7 +824,6 @@ LOG: MAIN => f1@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] log writing disabled locking TESTSUITE/spool/db/retry.lockfile -locking TESTSUITE/spool/db/wait-ut6.lockfile LOG: MAIN == f2@myhost.test.ex R=ut6 T=ut6 defer (-44): SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error log writing disabled diff --git a/test/stderr/0388 b/test/stderr/0388 index ab7d8ae32..dc12b2781 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -110,13 +110,6 @@ LOG: MAIN V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 -locking TESTSUITE/spool/db/wait-smtp.lockfile -locked TESTSUITE/spool/db/wait-smtp.lockfile -EXIM_DBOPEN(TESTSUITE/spool/db/wait-smtp) -returned from EXIM_DBOPEN -opened hints database TESTSUITE/spool/db/wait-smtp: flags=O_RDWR -dbfn_read: key=V4NET.0.0.0 -dbfn_write: key=V4NET.0.0.0 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish diff --git a/test/stderr/0543 b/test/stderr/0543 new file mode 100644 index 000000000..655762d0a --- /dev/null +++ b/test/stderr/0543 @@ -0,0 +1,54 @@ +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: queue_run MAIN + Start queue run: pid=pppp +locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +Considering: userx@domain1 +unique = userx@domain1 +userx@domain1: queued for routing +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +routing userx@domain1 +--------> smarthost router <-------- +local_part=userx domain=domain1 +calling smarthost router +smarthost router called for userx@domain1 + domain = domain1 +set transport smtp +queued for smtp transport: local_part = userx +domain = domain1 + errors_to=NULL + domain_data=NULL localpart_data=NULL +routed by smarthost router + envelope to: userx@domain1 + transport: smtp +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +After routing: + Local deliveries: + Remote deliveries: + userx@domain1 + Failed addresses: + Deferred addresses: +locking TESTSUITE/spool/db/retry.lockfile +locking TESTSUITE/spool/db/wait-smtp.lockfile +LOG: MAIN + => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] +LOG: MAIN + Completed +locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +Considering: usery@domain1 +unique = usery@domain1 +LOG: retry_defer MAIN + == usery@domain1 routing defer (-51): retry time not reached +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +After routing: + Local deliveries: + Remote deliveries: + Failed addresses: + Deferred addresses: + usery@domain1 +LOG: queue_run MAIN + End queue run: pid=pppp +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> |