Fix spurious detection of timeout while writing to transport filter

[users/jgh/exim.git] / test / stderr / 0382

diff --git a/test/stderr/0382 b/test/stderr/0382
index 6fdaaa9664c4088c0cff75c7d36a1ce854fce186..cf2af99c4db89b7279a3ec8cbdfaaa646e61d7c7 100644 (file)
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -8,9 +8,10 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 running system filter
 running system filter

-Filtering did not set up a significant delivery.
-Normal delivery will occur.
+ Filtering did not set up a significant delivery.
+ Normal delivery will occur.

 system filter returned 1
 LOG: MAIN
   ** userx@test.ex R=r1: forced fail
 system filter returned 1
 LOG: MAIN
   ** userx@test.ex R=r1: forced fail


@@ -24,9 +25,10 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 running system filter
 running system filter

-Filtering did not set up a significant delivery.
-Normal delivery will occur.
+ Filtering did not set up a significant delivery.
+ Normal delivery will occur.

 system filter returned 1
 LOG: MAIN
   ** CALLER@test.ex: Unrouteable address
 system filter returned 1
 LOG: MAIN
   ** CALLER@test.ex: Unrouteable address


@@ -41,12 +43,14 @@ LOG: MAIN
 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

 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed

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

 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>