Testsuite: deal better with -bt output and long test-system ipv4 addresses

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

diff --git a/test/confs/0002 b/test/confs/0002
index 6983fd87f18385aaad761e9948f19625798ec95c..a6a1581d9a5d5698f83a1431706e3802caeb7369 100644 (file)
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -6,7 +6,6 @@ PTBC=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -44,4 +43,20 @@ check_data:
   warn  logwrite = Subject is: "$h_subject:"
   deny  message = reply_address=<$reply_address>
 
+a_ret:
+  accept message = ($acl_narg) [$acl_arg1] [$acl_arg2]
+
+a_none:
+  accept
+
+a_deny:
+  deny message = ($acl_narg) [$acl_arg1] [$acl_arg2]
+
+a_defer:
+  defer
+
+a_sub:
+  require acl = a_none foo bar baz barf
+  require acl = a_deny "new arg1" $acl_arg1
+
 # End