Testsuite: output changes resulting

[exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index c9337869d8b5669f161d16543f82ad7113ae2cf1..b8ff36122c53752ec4bc3a0499e206f2f90c1b54 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -115,6 +115,15 @@
 > listextract: fail
 > Failed: "listextract" failed and "fail" requested
 > 
 > listextract: fail
 > Failed: "listextract" failed and "fail" requested
 > 

+> listquote: abcd
+> listquote: ab::cd
+> listquote: ::a::b::c::d::
+> listquote: ab::::cd
+> listquote: ab:cd
+> listquote: ab;;cd
+> listquote:   ab  cd
+> listquote: < >
+> 

 > sort: 1:2:3:4
 > sort: 4,3,2,1
 > sort: a:aa:B:c
 > sort: 1:2:3:4
 > sort: 4,3,2,1
 > sort: a:aa:B:c


@@ -138,7 +147,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 +156,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 +170,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 +247,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)"


@@ -433,9 +444,9 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > match_domain:    yes
 > match_domain:    no
 > 
 > match_domain:    yes
 > match_domain:    no
 > 

->  >x@zz.aa.bb< [] >x@zz.aa.bb< 
+>  >x@zz.aa.bb< [zz] >x@zz.aa.bb< 

 > 
 > 

->  >x@xxxabc< [] >x@xxxabc< 
+>  >x@xxxabc< [abc] >x@xxxabc< 

 > 
 > match_address:   yes
 > match_address:   yes
 > 
 > match_address:   yes
 > match_address:   yes


@@ -469,7 +480,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 +884,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