Fix spurious detection of timeout while writing to transport filter

[users/jgh/exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index c9337869d8b5669f161d16543f82ad7113ae2cf1..01e96fe78cffcc33f00567b58c777fcf47c06aa5 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -138,7 +138,7 @@
 > 
 > Failed: Not enough arguments for 'acl' (min is 1)
 > Failed: Not enough arguments for 'acl' (min is 1)
 > 
 > Failed: Not enough arguments for 'acl' (min is 1)
 > Failed: Not enough arguments for 'acl' (min is 1)

-> Failed: error from acl "a_nosuch"
+> Failed: ERROR from acl "a_nosuch"

 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
 > acl: (2) [firstarg] [secondarg]
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
 > acl: (2) [firstarg] [secondarg]


@@ -147,7 +147,7 @@
 > acl: 
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
 > acl: 
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []

-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"

 > acl: (2) [new arg1] [top_arg_1]
 > acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
 > 
 > acl: (2) [new arg1] [top_arg_1]
 > acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
 > 


@@ -161,6 +161,7 @@
 > domain: dom.ain
 > domain: dom.ain
 > domain: dom.ain
 > domain: dom.ain
 > domain: dom.ain
 > domain: dom.ain

+> domain: 

 > 
 > addresses: ''abc@xyz' ''pqr@xyz
 > addresses: local-part@dom.ain
 > 
 > addresses: ''abc@xyz' ''pqr@xyz
 > addresses: local-part@dom.ain


@@ -237,6 +238,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > lclpt:  local-part
 > lclpt:  local-part
 > lclpt:  local.part
 > lclpt:  local-part
 > lclpt:  local-part
 > lclpt:  local.part

+> lclpt:  a.b.c

 > quote:  aZ09_.-Q "ab*cd" "abcd\"ef"
 > quote:  "nl(\n)"
 > quote:  "cr(\r)"
 > quote:  aZ09_.-Q "ab*cd" "abcd\"ef"
 > quote:  "nl(\n)"
 > quote:  "cr(\r)"


@@ -469,7 +471,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > acl if: Y:(0) [] []
 > acl if: Y:(1) [argY] []
 > acl if: N:(2) [argN] [arg2]
 > acl if: Y:(0) [] []
 > acl if: Y:(1) [argY] []
 > acl if: N:(2) [argN] [arg2]

-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"

 > 
 > # Default values for both if strings
 > 
 > 
 > # Default values for both if strings
 > 


@@ -873,6 +875,7 @@ xyz
 > escape: B7·F2ò
 > 
 > primary_hostname: myhost.test.ex
 > escape: B7·F2ò
 > 
 > primary_hostname: myhost.test.ex

+> sender_address: sndr@dom

 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes
 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes