Remove word "rejected" from ACL-discard log lines. Bug 1632

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

diff --git a/test/stdout/0002 b/test/stdout/0002
index c009fbd1214f9d92d903876faf292d09d60147cf..6c195b2691f783bc7c99d8c63fcb1510e533cd45 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -6,6 +6,9 @@
 > # Some fixed variables
 > 
 > exim_path: TESTSUITE/eximdir/exim
+> exim_version: x.yz
+> config_dir: TESTSUITE
+> config_file: TESTSUITE/test-config
 > primary_hostname: myhost.test.ex
 > primary_hostname: myhost.test.ex
 > qualify_domain: myhost.test.ex
@@ -49,6 +52,35 @@
 > reduce: 6
 > reduce: 9
 > 
+> listnamed: *.aa.bb : ^\Nxxx(.*)
+> listnamed: *.aa.bb : ^\Nxxx(.*)
+> listnamed: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch
+> listnamed: *.aa.bb : ^\Nxxx(.*) : ;;
+> listnamed: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664
+> Failed: "nolist" is not a named list
+> listnamed: *.aa.bb : ^\Nxxx(.*)
+> Failed: "hlist" is not a domain named list
+> Failed: bad suffix on "list" operator
+> 
+> listcount: 3
+> listcount: 0
+> listcount: 3
+> listcount: 2
+> 
+> listextract: b
+> listextract: XcX
+> listextract: 
+> listextract: 
+> listextract: fail
+> Failed: "extract" failed and "fail" requested
+> 
+> sort: 1:2:3:4
+> sort: 4,3,2,1
+> sort: a:aa:B:c
+> sort: 10 smtp.ex.com:100 r2.ex.com:666 r99.ex.com
+> sort: 10,smtp.ex.com:100,r2.ex.com:666,r99.ex.com
+> sort: ""
+> 
 > # Tests with iscntrl() and illegal separators
 > 
 > map: 'a'
@@ -63,6 +95,21 @@
 > 
 > # Operators
 > 
+> Failed: missing or misplaced { or }
+> Failed: missing or misplaced { or }
+> Failed: error from acl "a_nosuch"
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> acl: (2) [firstarg] [secondarg]
+> acl: (1) [arg with spaces] []
+> acl: 
+> acl: 
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> Failed: error from acl "a_defer"
+> acl: (2) [new arg1] [top_arg_1]
+> acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
+> 
 > addrss: local-part@dom.ain
 > addrss: local-part@dom.ain
 > domain: dom.ain
@@ -166,6 +213,7 @@
 > quote_local_part: "abcd\"ef"
 > quote_local_part: ""
 > rxquote:aZ09\_\,\-Q ab\*cd abcd\"ef
+> hexquote: \x01\x02\x03\x04\x05\x06\x07\x20\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x20\x10\x11\x12\x13\x14\x15\x16\x17\x20\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x20!"#$%&'\x20()*+,-./\x2001234567\x2089:;<=>?\x20@ABCDEFG\x20HIJKLMNO\x20PQRSTUVW\x20XYZ[\]^_\x20`abcdefg\x20hijklmno\x20pqrstuvw\x20xyz{|}~\x7f
 > substr: ba 34  1
 > substr: barb rhuba
 > substr: 
@@ -220,12 +268,20 @@
 > md5:    NO
 > mask:   NO
 > 
+> # Number suffixes in conditions
+> 1k: y
+> 1K: y
+> 1M: y
+> 1G: y
+> 
 > # Numeric overflow
 > # >32b should work, >64b not
 > 
-> 4096M      y
-> 4096000000 y
-> 4611686018427387904  y
+> 1 > 2047M                n
+> 1 > 2048M                n
+> 1 > 4096000000           n
+> 1 > 4096M                n
+> 1 > 4611686018427387904  n
 > Failed: absolute value of integer "46116860184273879040" is too large (overflow)
 > 
 > # Conditions
@@ -258,6 +314,7 @@
 > 5>3m:   n
 > Failed: invalid integer "3z "
 > Failed: integer expected but "a" found
+> Failed: integer expected but "${substr_2_2:65535}" found
 > 
 > >0:     n
 > =:      y
@@ -356,6 +413,12 @@
 > queue_running after or: y
 > first_delivery after or: y
 > 
+> # acl expansion condition
+> acl if: Y:(0) [] []
+> acl if: Y:(1) [argY] []
+> acl if: N:(2) [argN] [arg2]
+> Failed: error from acl "a_defer"
+> 
 > # Default values for both if strings
 > 
 > ${if eq{1}{1}}  >true<
@@ -511,7 +574,7 @@
 > " yes"                true      EXPECT: true
 > " no"                 false     EXPECT: false
 > "yes "                true      EXPECT: true
-> Failed: unrecognised boolean value "-1"
+> "-1"                  true     EXPECT: true
 > "0"                   false     EXPECT: false
 > "1"                   true      EXPECT: true
 > " 0 "                 false     EXPECT: false
@@ -521,6 +584,7 @@
 > " "                   false     EXPECT: false
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
+> Failed: unrecognised boolean value "-text"
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
 > "00"                  false     EXPECT: false
@@ -830,3 +894,6 @@ xyz
 > match_ip:        15 
 > match_ip:        16 
 > 
+> in list
+> in list
+>