DMARC: write history file even under testsuite

[exim.git] / test / stderr / 0315

diff --git a/test/stderr/0315 b/test/stderr/0315
index 1c3e974f4297a6ce138de3457020af39b815ad5e..4dc506af420906357de2e8843c3792ec330380b5 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-DSN: r1 propagating DSN
-DSN: r2 propagating DSN

 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log


@@ -10,9 +8,8 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-delivering 10HmaX-0005vi-00
+dropping to exim gid; retaining priv uid
+delivering 10HmaX-000000005vi-0000

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -35,7 +32,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=ten-1.test.ex local_part_data=NULL

 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1
 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1


@@ -58,22 +55,19 @@ LOG: MAIN
   *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
   *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

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

-DSN: r1 propagating DSN
-DSN: r2 propagating DSN

 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-delivering 10HmaY-0005vi-00
+dropping to exim gid; retaining priv uid
+delivering 10HmaY-000000005vi-0000

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -99,7 +93,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1
 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1


@@ -118,7 +112,7 @@ r2 router called for x@ten-2.test.ex
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1
 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1


@@ -138,5 +132,5 @@ LOG: MAIN
   *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
   *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>