Testsuite: followon -bt output changes

[users/heiko/exim.git] / test / confs / 2201

diff --git a/test/confs/2201 b/test/confs/2201
index 861db77ba852e11acf2e576931df77b09ba373d7..a4a44d4da658aad057cfd640f5c621c322eb9f8c 100644 (file)
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -3,7 +3,6 @@
 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 = ""
@@ -12,12 +11,45 @@ gecos_name = CALLER_NAME
 # ----- Main settings -----
 
 trusted_users = CALLER
+disable_ipv6
+
+acl_smtp_rcpt = check_rcpt
+acl_not_smtp = check_sndr
+queue_only
+
+# - ACL --
+begin acl
+
+check_rcpt:
+       # Do not care about result, looking at debug output
+       # expect an original lookup, a cached lookup avoidance
+       # then a TTL-required repeat lookup
+  warn dnslists =      rbl.test.ex/V4NET.11.12.14
+       dnslists =      rbl.test.ex/V4NET.11.12.14
+       delay =         4s
+       dnslists =      rbl.test.ex/V4NET.11.12.14
+  accept
+
+check_sndr:
+       # Do not care about result, looking at debug output
+       # expect an original lookup, a cached lookup avoidance
+       # then a TTL-required repeat lookup
+  warn sender_domains = dnsdb;a=$sender_address_domain
+       sender_domains = dnsdb;a=$sender_address_domain
+       delay =         4s
+       sender_domains = dnsdb;a=$sender_address_domain
+  accept
 
 
 # ----- Routers -----
 
 begin routers
 
+r0:
+  driver = accept
+  senders = a@shorthost.test.ex
+  transport = remote_delivery
+
 r1:
   driver = accept
   domains = dnsdb;$domain
@@ -42,6 +74,11 @@ local_delivery:
   file = DIR/test-mail/$local_part
   user = CALLER
 
+remote_delivery:
+  driver = smtp
+  hosts = 127.0.0.1
+  allow_localhost
+  port = PORT_D
 
 # ----- Retry -----