add an internal error code definition

[users/heiko/exim.git] / test / stderr / 0332

diff --git a/test/stderr/0332 b/test/stderr/0332
index eaf97e37030f7011299c0e1a29760b7d05b2ee0d..67efe896d50bf009f1e445bbf4a690572c47fbc2 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -4,8 +4,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp

-fresh-exec forking for qrun delivery
-postfork: qrun delivery

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay


@@ -23,7 +21,7 @@ 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

-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL

 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -34,18 +32,8 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
     ok@no.delay
   Failed addresses:
   Deferred addresses:

-qrun delivery forking for transport
-postfork: transport

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

-transport forking for continued-transport interproc
-postfork: continued-transport interproc
-continued-transport interproc forking for continued-transport
-postfork: continued-transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
-transport forked for continued-transport interproc: npppp
-continued-transport interproc forked for continued-transport: npppp

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


@@ -61,7 +49,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN

-  == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer
+  == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer

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


@@ -78,7 +66,7 @@ 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

-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL

 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -90,22 +78,17 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns

-fresh-exec forking for transport
-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/retry.lockfile

-fresh-exec forked for transport: npppp

 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN

-  == delay@test.again.dns routing defer (-51): retry time not reached
+  == delay@test.again.dns routing defer (-52): retry time not reached

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:


@@ -114,7 +97,6 @@ After routing:
   Deferred addresses:
     delay@test.again.dns
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
   Deferred addresses:
     delay@test.again.dns
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun delivery: npppp

 LOG: queue_run MAIN
   End queue run: pid=pppp
 LOG: queue_run MAIN
   End queue run: pid=pppp

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>