DMARC: add variables for spf/dkim alignment results. Bug 3119

[exim.git] / test / stderr / 0333

diff --git a/test/stderr/0333 b/test/stderr/0333
index 422ed67bb6a07ae5fe6f72f3e9a3d25ae4c334dc..44f2f123bb66b13cadb9b031e5296ef81746167b 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -1,8 +1,8 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay


@@ -30,20 +30,13 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
     ok@no.delay
   Failed addresses:
   Deferred addresses:

-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile

 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'

+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+fresh-exec becomes continued-delivery

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns


@@ -61,7 +54,6 @@ checking domains
 calling r1 router
 r1 router called for ok@no.delay
   domain = no.delay
 calling r1 router
 r1 router called for ok@no.delay
   domain = no.delay

-set transport t1

 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL


@@ -77,9 +69,8 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns

-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
-cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250'
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

->>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (continued-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>