tidying

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

diff --git a/test/stderr/0357 b/test/stderr/0357
index bde398c56133146908c71d5d21d20cbd6cc934db..53ecffabeaa4ab251cfa15a32d99077fe13f987a 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -4,8 +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
-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


@@ -24,8 +22,6 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
     userx@test.ex
   Failed addresses:
   Deferred addresses:

-local-accept-delivery forking for transport
-local-accept-delivery forked for transport: npppp

 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available


@@ -54,8 +50,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
-fresh-exec forked for qrun-delivery: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex


@@ -71,8 +65,6 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
     userx@test.ex
   Failed addresses:
   Deferred addresses:

-qrun-delivery forking for transport
-qrun-delivery forked for transport: npppp

 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record


@@ -115,8 +107,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
-fresh-exec forked for qrun-delivery: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex


@@ -132,8 +122,6 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
     userx@test.ex
   Failed addresses:
   Deferred addresses:

-qrun-delivery forking for transport
-qrun-delivery forked for transport: npppp

 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record


@@ -176,8 +164,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
-fresh-exec forked for qrun-delivery: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex


@@ -187,7 +173,7 @@ retry time not reached: checking ultimate address timeout
   now=tttt first_failed=tttt next_try=tttt expired=F
   received_time=tttt diff=tttt timeout=3600
 LOG: retry_defer MAIN
   now=tttt first_failed=tttt next_try=tttt expired=F
   received_time=tttt diff=tttt timeout=3600
 LOG: retry_defer MAIN

-  == userx@test.ex routing defer (-51): retry time not reached
+  == userx@test.ex routing defer (-52): retry time not reached

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