X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/fd4f9c92ea39447557f1847c6bdb4e178e972fec..3fc07bd5708d5b42e5a9a3bcf7ea1928a35eccb3:/test/stdout/0002 diff --git a/test/stdout/0002 b/test/stdout/0002 index ab59183a2..01e96fe78 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -14,6 +14,7 @@ > qualify_domain: myhost.test.ex > bounce_return_size_limit: 102400 > spool_directory: TESTSUITE/spool +> queue_name: > Failed: unknown variable in "${unknown}" > h_subject: (should be empty) > h_subject: (should be empty) @@ -33,6 +34,44 @@ > + > + > +> eval: 0 +> eval: 1 +> eval: -1 +> eval: 1 +> eval: 2 +> eval: 7 +> eval: 9 +> eval: 4 +> eval: 6 +> eval: 42 +> Failed: error in expression evaluation: expecting number or opening parenthesis (after processing "") +> eval: -2 +> eval: 1 +> eval: 1 +> Failed: error in expression evaluation: expecting closing parenthesis (after processing "-2 - (-3") +> Failed: error in expression evaluation: expecting operator (after processing "-2 - -3") +> eval: 1 +> eval: -5 +> eval: 1 +> eval: 40962 +> eval: 63 +> Failed: error in expression evaluation: expecting operator (after processing "0") +> eval10: 77 +> eval10: 8 +> Failed: error in expression evaluation: expecting operator (after processing "0") +> eval: 4 +> eval: 4 +> eval: 4 +> eval: 13 +> eval: 9 +> eval: 6 +> eval: 3 +> eval: 0 +> eval: 24 +> eval: 4608 +> eval: 4608 +> eval: -4608 +> > # List operations > > filter: "a:b:c" @@ -51,6 +90,8 @@ > reduce: +abc > reduce: 6 > reduce: 9 +> # Check for extract corrupting reduce's +> reduce: a , b > > listnamed: *.aa.bb : ^\Nxxx(.*) > listnamed: *.aa.bb : ^\Nxxx(.*) @@ -95,9 +136,9 @@ > > # Operators > -> Failed: missing or misplaced { or } -> Failed: missing or misplaced { or } -> Failed: error from acl "a_nosuch" +> Failed: Not enough arguments for 'acl' (min is 1) +> Failed: Not enough arguments for 'acl' (min is 1) +> Failed: ERROR from acl "a_nosuch" > acl: (0) [] [] > acl: (1) [person@dom.ain] [] > acl: (2) [firstarg] [secondarg] @@ -106,55 +147,32 @@ > 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] [] > > addrss: local-part@dom.ain > addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part.dot-atom@dom.ain +> addrss: local-part@dom.ain > domain: dom.ain > domain: dom.ain +> domain: dom.ain +> domain: > > addresses: ''abc@xyz' ''pqr@xyz > addresses: local-part@dom.ain > addresses: local-part@dom.ain+xyz@abc > addresses: local-part@dom.ain:xyz@abc:p@q:r@s > addresses: +> Failed: output separator missing in expanding ${addresses:>} > -> escape: B7\267F2\362 -> eval: 2 -> eval: 7 -> eval: 9 -> eval: 4 -> eval: 6 -> eval: 42 -> Failed: error in expression evaluation: expecting number or opening parenthesis (after processing "") -> eval: -2 -> eval: 1 -> eval: 1 -> Failed: error in expression evaluation: expecting closing parenthesis (after processing "-2 - (-3") -> Failed: error in expression evaluation: expecting operator (after processing "-2 - -3") -> eval: 1 -> eval: -5 -> eval: 1 -> eval: 40962 -> eval: 63 -> Failed: error in expression evaluation: expecting operator (after processing "0") -> eval10: 77 -> eval10: 8 -> Failed: error in expression evaluation: expecting operator (after processing "0") -> eval: 4 -> eval: 4 -> eval: 4 -> eval: 13 -> eval: 9 -> eval: 6 -> eval: 3 -> eval: 0 -> eval: 24 -> eval: 4608 -> eval: 4608 -> eval: -4608 +> escape: B7\267F2\362 +> excape8bit: undisturbed text tab +newline tab\134backslash ~tilde\177DEL\200\201. > > expand: $primary_hostname myhost.test.ex > hash: jmg monty fbWx @@ -182,7 +200,7 @@ > base32d: 42 42 > Failed: argument for base32d operator is "ABC", which is not a base 32 number > -> The base62 operator is actually a base36 operator in the Darwin and Cygwin +> the base62 operator is actually a base36 operator in the Darwin and Cygwin > environments. Write cunning tests that produce the same output in both cases, > while doing a reasonable check. > @@ -219,6 +237,8 @@ > length: The quick abc > 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)" @@ -283,9 +303,9 @@ > > # Error forms > -> Failed: missing or misplaced { or } +> Failed: Not enough arguments for 'hash' (min is 2) > Failed: "nonnumber" is not a number (in "hash" expansion) -> Failed: Too many arguments for "hash" (max is 3) +> Failed: Too many arguments for 'hash' (max is 3) > Failed: "-2" is not a positive number (in "substr" expansion) > > # Skipped operators @@ -357,7 +377,8 @@ > Failed: unknown variable "post" after "def:" > def:h_f n > def:h_f n -> Failed: missing or misplaced { or } +> Failed: curly-bracket problem in conditional yes/no parsing: 'yes' part did not start with '{' + remaining string is ':{y}{n}}' > > exists: y > exists: n @@ -386,6 +407,8 @@ > isip: y 1.2.3.4 > isip4: y 1.2.3.4 > isip6: n 1.2.3.4 +> isip: n ::1.2.3.256 +> isip4: n 1.2.3.256 > isip: n 1:2:3:4 > isip4: n 1:2:3:4 > isip6: n 1:2:3:4 @@ -395,6 +418,7 @@ > isip: y fe80::a00:20ff:fe86:a061 > isip4: n fe80::a00:20ff:fe86:a061 > isip6: y fe80::a00:20ff:fe86:a061 +> isip: y fe80::1.2.3.4 > isip: n rhubarb > isip4: n rhubarb > isip6: n rhubarb @@ -447,7 +471,7 @@ > 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 > @@ -484,8 +508,8 @@ > a.b.c: *.b.c > ab.c: *b.c > xyz: ^X -> Xyz: ^X -> Zyz: ^Z +> .Xyz: ^X +> .Zyz: ^Z > a b: "^a +b" > a b: "^a +b" > a:b: lookup succeeded @@ -500,8 +524,8 @@ > a.b.c: *.b.c > ab.c: *b.c > xyz: ^X -> Xyz: ^X -> Zyz: ^Z +> .Xyz: ^X +> .Zyz: ^Z > a b: "^a +b" > a b: "^a +b" > a:b: lookup succeeded @@ -520,10 +544,10 @@ > > # Some tests of case-(in)dependence > -> MiXeD-CD: Data found for case-dependent MiXeD-CD -> MixeD-CD: NOT FOUND -> MiXeD-Ncd: Data found for case-independent MiXeD-nCD -> MixeD-Ncd: Data found for case-independent MiXeD-nCD +> .MiXeD-CD: Data found for case-dependent MiXeD-CD +> .MixeD-CD: NOT FOUND +> .MiXeD-Ncd: Data found for case-independent MiXeD-nCD +> .MixeD-Ncd: Data found for case-independent MiXeD-nCD > > # IP address (CIDR) lookups > @@ -567,12 +591,12 @@ > 2 > 2 > 2 -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > <3> > <3> -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > no Z > no 4 > Failed: "extract" failed and "fail" requested @@ -591,6 +615,10 @@ > Failed: first argument of "extract" must not be empty > b > +> a:b:c +> Failed: missing '}' closing extract inside "map" item +> a:b:c +> > # Translation > > abcdea aaa xyz zbcdez @@ -647,8 +675,8 @@ > abcd abcd > <:abcd:> =?iso-8859-8?Q?=3C=3Aabcd=3A=3E?= > <:ab cd:> =?iso-8859-8?Q?=3C=3Aab_cd=3A=3E?= -> Long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit?= -> Long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit_by_a_long_way=3B_in?= =?iso-8859-8?Q?_fact_this_one_will_go_over_the_150_character_limit?= +> long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit?= +> long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit_by_a_long_way=3B_in?= =?iso-8859-8?Q?_fact_this_one_will_go_over_the_150_character_limit?= > > # RFC 2047 decode > @@ -675,7 +703,7 @@ > > # File insertion > -> Failed: missing or misplaced { or } +> Failed: Not enough arguments for 'readfile' (min is 1) > abcde 12345 @@ -693,25 +721,25 @@ xyz > abcd 1234 -> RC=0 +> rc=0 > 1 -> RC=0 +> rc=0 > abcd 1234 -> RC=0 +> rc=0 > 2 -> RC=1 +> rc=1 > abcd 1234 -> RC=1 +> rc=1 > N -> RC=127 +> rc=127 > >><< -> RC=0 +> rc=0 > 1!=2 -> RC=0 +> rc=0 > > # PRVS > @@ -721,9 +749,9 @@ xyz > > # Syntax errors > -> Failed: prvs second argument must be a single digit -> Failed: prvs second argument must be a single digit -> Failed: prvs second argument must be a single digit +> Failed: prvs third argument must be a single digit +> Failed: prvs third argument must be a single digit +> Failed: prvs third argument must be a single digit > > # Correct checks; can't put explicit addresses in the tests, because they > # will change over time. @@ -761,7 +789,8 @@ xyz > Failed: unknown condition "xya" inside "and{...}" condition > Failed: condition name expected, but found "${lookup{x}lsear" inside "and{...}" condition > Failed: missing } at end of string - could be header name not terminated by colon -> Failed: missing or misplaced { or } +> Failed: curly-bracket problem in conditional yes/no parsing: did not close with '}' + remaining string is '' > Failed: missing or misplaced { or } - could be header name not terminated by colon > Failed: each subcondition inside an "or{...}" condition must be in its own {} > Failed: missing } at end of condition inside "or" group @@ -813,10 +842,46 @@ xyz > CALLER > correct > +> # JSON +> +> "http://www.example.com/image/481989943" +> 100 +> 943 +> 943 +> +> "green" +> green +> <> +> expect: <> +> +> 59 +> 59 +> +> {"1":116, "2":943, "3":234} +> expect: {"1":116, "2":943, "3":234} +> +> {"1":116, "2":943, "3":234} +> expect: {"1":116, "2":943, "3":234} +> +> <> +> expect: <> +> <> +> expect: <> +> +> yes +> yes +> > > escape: B7·F2ò > > primary_hostname: myhost.test.ex +> sender_address: sndr@dom +> match: cdab +> Failed: "if" failed and "fail" requested +> yes +> match_address: no +> +> primary_hostname: myhost.test.ex > match: cdab > Failed: "if" failed and "fail" requested > yes