Clarify forbit/permit coding for ACL conditions

[exim.git] / test / stderr / 0543

diff --git a/test/stderr/0543 b/test/stderr/0543
index 4a12a9b90862a61f7427fcf2e262729c7ac4965a..f43aa63fe19e9775c960927ed5ba14047c467777 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -1,10 +1,10 @@
 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
 LOG: queue_run MAIN
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN

-  Start queue run: pid=pppp
-locking TESTSUITE/spool/db/retry.lockfile
+  Start queue run: pid=p1234

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@domain1
 unique = userx@domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@domain1
 unique = userx@domain1


@@ -31,14 +31,13 @@ After routing:
     userx@domain1
   Failed addresses:
   Deferred addresses:
     userx@domain1
   Failed addresses:
   Deferred addresses:

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

 LOG: MAIN
   => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1
 unique = usery@domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1
 unique = usery@domain1


@@ -51,7 +50,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     usery@domain1
   Failed addresses:
   Deferred addresses:
     usery@domain1

->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
 LOG: queue_run MAIN

-  End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>