summaryrefslogtreecommitdiff
path: root/test/stderr/0377
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-06-26 12:10:03 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-06-26 12:21:08 +0100
commit9f1a75f126ae217a3a3568b106c9133b3c5c413a (patch)
tree9a7ac8fe4c827c981b49946260ea0d1aa1e5524d /test/stderr/0377
parent57318bfd2312ea561661906ca8001bd74a01b312 (diff)
parent89318c714454e11217505d2163d807d5d827f50a (diff)
downloadexim4-9f1a75f126ae217a3a3568b106c9133b3c5c413a.tar.gz
Merge branch '4.next'4.next
Diffstat (limited to 'test/stderr/0377')
-rw-r--r--test/stderr/037720
1 files changed, 10 insertions, 10 deletions
diff --git a/test/stderr/0377 b/test/stderr/0377
index 158a2e161..192d87f43 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -308,14 +308,14 @@ locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> cccc <cccc@myhost.test.ex> R=cccc_accept T=t1
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
- Start queue run: pid=pppp -qf
+ Start queue run: pid=p1234 -qf
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@myhost.test.ex
@@ -551,16 +551,16 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded
aaaa@myhost.test.ex was previously delivered (t1 transport): discarded
bbbb@myhost.test.ex was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
- End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
- Start queue run: pid=pppp -qf
+ Start queue run: pid=p1235 -qf
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@myhost.test.ex
@@ -796,7 +796,7 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded
aaaa@myhost.test.ex was previously delivered (t1 transport): discarded
bbbb@myhost.test.ex was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
- End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ End queue run: pid=p1235 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>