diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-06-12 22:50:52 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-06-12 22:50:52 +0100 |
| commit | 525239c16e35d7bf893e0e2232f4c4c4a7c75447 (patch) | |
| tree | e61d7715ff4f7e35bdb4eb04659d0a99809edc4d /test | |
| parent | 723c72e64c04d3b7bdf03b26c65761c1ae569312 (diff) | |
Use custom variables for ACL args, up to nine. Add an arg-count variable.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0002 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0002 | 2 | ||||
| -rw-r--r-- | test/stdout/0002 | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/test/confs/0002 b/test/confs/0002 index 317c4a27d..df65e2c30 100644 --- a/test/confs/0002 +++ b/test/confs/0002 @@ -45,7 +45,7 @@ check_data: deny message = reply_address=<$reply_address> a_ret: - accept message = [$address_data] + accept message = ($acl_narg) [$acl_arg1] [$acl_arg2] a_none: accept diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index d567f8486..62a0a1f56 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -91,6 +91,8 @@ acl: ${acl} acl: ${acl {a_bad}} acl: ${acl {a_ret}} acl: ${acl {a_ret}{person@dom.ain}} +acl: ${acl {a_ret}{firstarg}{secondarg}} +acl: ${acl {a_ret}{arg with spaces}} acl: ${acl {a_none}} acl: ${acl {a_none}{person@dom.ain}} acl: ${acl {a_deny}} diff --git a/test/stdout/0002 b/test/stdout/0002 index 377fe02cd..edf18d18c 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -81,13 +81,15 @@ > Failed: missing or misplaced { or } > Failed: missing or misplaced { or } > Failed: acl "a_bad" did not accept -> acl: [] -> acl: [person@dom.ain] +> acl: (0) [] [] +> acl: (1) [person@dom.ain] [] +> acl: (2) [firstarg] [secondarg] +> acl: (1) [arg with spaces] [] > acl: > acl: > Failed: acl "a_deny" did not accept > Failed: acl "a_deny" did not accept -> acl: [1] [2] [3] [4] +> acl: (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] [] > > addrss: local-part@dom.ain > addrss: local-part@dom.ain |