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

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

diff --git a/test/confs/0038 b/test/confs/0038
index 497623a6d243b0fc5297716a62512cb912ce55a3..6c4c332ae9020bb60728ff76f4b4c70dae7bafe1 100644 (file)
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -2,11 +2,11 @@
 
 RRATELIMIT=0/1h/strict
 DRATELIMIT=0/1h/per_byte/strict
+ACLRCPT=check_rcpt
 
 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 = ""
@@ -14,7 +14,7 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = check_rcpt
+acl_smtp_rcpt = ACLRCPT
 acl_smtp_data = check_data
 qualify_domain = test.ex
 
@@ -31,6 +31,21 @@ check_rcpt:
                         sender_rate_period=$sender_rate_period
     accept
 
+check_rcpt2:
+    warn  ratelimit = RRATELIMIT/noupdate
+          log_message = RCPT2-1: \
+                        sender_rate=$sender_rate \
+                        sender_rate_limit=$sender_rate_limit \
+                        sender_rate_period=$sender_rate_period
+
+    warn  ratelimit = RRATELIMIT
+          log_message = RCPT2-2: \
+                        sender_rate=$sender_rate \
+                        sender_rate_limit=$sender_rate_limit \
+                        sender_rate_period=$sender_rate_period
+
+    accept
+
 check_data:
     warn  ratelimit = DRATELIMIT
           log_message = DATA: \