Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537

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

diff --git a/test/stderr/0554 b/test/stderr/0554
index af486a04bf49b22bd3a8007f840aa70c91be6465..eb0e3c2a5d8b26d3e4cca5f7dd5e339e290f691d 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -1,12 +1,13 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y

-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record

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


@@ -38,10 +39,12 @@ end of retry processing
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y

-no domain retry record
+no   domain  retry record
+have address retry record; next_try = now+0

 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-1 more_errno=dd flags=1
 added retry item for R:x@y: errno=-1 more_errno=dd flags=1
 added retry item for R:y: errno=-1 more_errno=dd flags=1
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-1 more_errno=dd flags=1
 added retry item for R:x@y: errno=-1 more_errno=dd flags=1
 added retry item for R:y: errno=-1 more_errno=dd flags=1