Testsuite: munge for dns neg-cache

diff --git a/test/runtest b/test/runtest
index 0103df7d54bc93520b399f301a86c19e0a447118..9e25a200f865b44f65daf6d1e168fb4a4700f444 100755 (executable)
--- 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/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/;
 
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;

diff --git a/test/stderr/2202 b/test/stderr/2202
index 8472e8086cfbc093d938224410f27444e38bb637..55f935040a4e18a45f4bbef172c560dc72d26b13 100644 (file)
--- 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
   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
    ╎   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)
    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 0b41d07ea59b12ff5245067013b5506accf598d8..8da93ab49fa189160bf23f36114585fc9e26ca12 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -18,12 +18,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> calling client router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> 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
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout