Testsuite: fix munging for ipv6 dns

[exim.git] / test / stderr / 0382

diff --git a/test/stderr/0382 b/test/stderr/0382
index 44293f1e78db8d7772ac39dffc65ec29fc45997d..eb418cfea9d248a85719f2a1cbeba21d04105507 100644 (file)
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -4,9 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@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 ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -16,20 +13,16 @@ running system filter
  Filtering did not set up a significant delivery.
  Normal delivery will occur.
 system filter returned 1
  Filtering did not set up a significant delivery.
  Normal delivery will occur.
 system filter returned 1

+test.ex in ""? no (end of list)
+CALLER@test.ex in senders? yes (end of list)

 LOG: MAIN
   ** userx@test.ex R=r1: forced fail
 LOG: MAIN
   ** userx@test.ex R=r1: forced fail

-local-accept-delivery forking for bounce-message
-postfork: bounce-message
-local-accept-delivery forked for bounce-message: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
 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
-bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -43,26 +36,23 @@ LOG: MAIN
   ** CALLER@test.ex: Unrouteable address
 LOG: MAIN
   Frozen (delivery error message)
   ** CALLER@test.ex: Unrouteable address
 LOG: MAIN
   Frozen (delivery error message)

->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (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
 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
-fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+  Start queue run: pid=p1234 -qf

 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed
 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
 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 >>>>>>>>>>>>>>>>