From 0585799ba85d257f1e2428c1615b00c30c60931e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 11 May 2024 16:25:32 +0100 Subject: [PATCH] Testsuite: munge for dns neg-cache --- test/runtest | 2 +- test/stderr/2202 | 4 ++-- test/stderr/5840 | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/runtest b/test/runtest index 0103df7d5..9e25a200f 100755 --- a/test/runtest +++ b/test/runtest @@ -1384,7 +1384,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //; # Platform-dependent resolver option bits - s/^ *(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/; + s/(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/; # timing variance, run-to-run s/^time on queue = \K1s/0s/; diff --git a/test/stderr/2202 b/test/stderr/2202 index 8472e8086..55f935040 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -161,14 +161,14 @@ LOG: MAIN PANIC dns_again_means_nonexist recursion seen for test.again.dns (assuming nonexist) ╎ ╎DNS: couldn't fake dnsa len ╎ ╎DNS: no SOA record found for neg-TTL - ╎ ╎ writing neg-cache entry for test.again.dns-MX-4100041, ttl -1 + ╎ ╎ writing neg-cache entry for test.again.dns-MX-xxxx, ttl -1 ╎ test.again.dns in "@mx_any"? no (end of list) ╎ end sublist try_again_dns_list ╎test.again.dns in dns_again_means_nonexist? yes (end of list) ╎test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH ╎DNS: couldn't fake dnsa len ╎DNS: no SOA record found for neg-TTL - ╎ update neg-cache entry for test.again.dns-MX-4100041, ttl -1 + ╎ update neg-cache entry for test.again.dns-MX-xxxx, ttl -1 test.again.dns in "@mx_any"? no (end of list) end sublist try_again_dns_list test.again.dns in "+try_again_dns_list"? no (end of list) diff --git a/test/stderr/5840 b/test/stderr/5840 index 0b41d07ea..8da93ab49 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -18,12 +18,12 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing rcptuser@dane256ee.test.ex >>> calling client router ->>> check dnssec require list ->>> dane256ee.test.ex in dnssec_require_domains? no (option unset) ->>> check dnssec request list ->>> dane256ee.test.ex in dnssec_request_domains? ->>> list element: * ->>> dane256ee.test.ex in dnssec_request_domains? yes (matched "*") +>>> check dnssec require list +>>> dane256ee.test.ex in dnssec_require_domains? no (option unset) +>>> check dnssec request list +>>> dane256ee.test.ex in dnssec_request_domains? +>>> list element: * +>>> dane256ee.test.ex in dnssec_request_domains? yes (matched "*") >>> local host found for non-MX address >>> routed by client router >>> Attempting full verification using callout -- 2.30.2