Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160

[exim.git] / test / stderr / 0370

diff --git a/test/stderr/0370 b/test/stderr/0370
index c7f6f360a5edc3ec0f9d6dafbb42876c7dfcfd9b..c2de395fa333516a2273f92ce483185ec1d6296e 100644 (file)
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -1,39 +1,27 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1235
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> |TESTSUITE/bin/iefbr14 <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
 changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1
-  uid=EXIM_UID gid=CALLER_GID pid=pppp
+  uid=EXIM_UID gid=CALLER_GID pid=p1236
 t1 transport entered
 direct command:
   argv[0] = 'TESTSUITE/bin/iefbr14'
-delivery (local) forking for child-open
-postfork: child-open
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
-delivery (local) forking for pipe-transport output
-postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
 Writing message to pipe
 writing data block fd=dddd size=sss timeout=3600
 writing error EEE: Broken pipe
@@ -43,8 +31,8 @@ t1 transport returned OK for |TESTSUITE/bin/iefbr14
 LOG: MAIN
   => |TESTSUITE/bin/iefbr14 <userx@test.ex> R=r1 T=t1
 changed uid/gid: post-delivery tidying
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1235
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>