Gitweb:
https://git.exim.org/exim.git/commitdiff/cdb844d019f4100eaceee36a521e9a4811a354f1
Commit: cdb844d019f4100eaceee36a521e9a4811a354f1
Parent: 7d8d08c484958a90f5d5744894b9bc2f723bee4e
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Sep 1 20:43:02 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Sep 1 20:43:02 2019 +0100
Testsuite: fix non-ipv6 platforms
Broken-by: 7d8d08c484
---
test/runtest | 1 +
test/stderr/0002 | 1 -
test/stderr/0094 | 2 --
test/stderr/0278 | 1 -
test/stderr/0361 | 1 -
test/stderr/0381 | 2 --
test/stderr/0419 | 2 --
test/stderr/0463 | 2 --
test/stderr/4802 | 2 --
test/stderr/4803 | 2 --
10 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/test/runtest b/test/runtest
index 8f6bd28..1df7fc7 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1093,6 +1093,7 @@ RESET_AFTER_EXTRA_LINE_READ:
next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
next if /DNS lookup of \S+ \(AAAA\) using fakens/;
next if / in dns_ipv4_lookup?/;
+ next if / writing neg-cache entry for .*AAAA/;
if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
{
diff --git a/test/stderr/0002 b/test/stderr/0002
index f0b7776..8f85e71 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -298,7 +298,6 @@ looking up host name for V4NET.0.0.1
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "ten-1.test.ex"
- writing neg-cache entry for ten-1.test.ex-AAAA-41, ttl 3600
DNS lookup of ten-1.test.ex (A) using fakens
DNS lookup of ten-1.test.ex (A) succeeded
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
diff --git a/test/stderr/0094 b/test/stderr/0094
index b59d608..26cf916 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -83,14 +83,12 @@ DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "oneback.test.ex"
alias "host1.masq.test.ex"
- writing neg-cache entry for oneback.test.ex-AAAA-41, ttl 3600
DNS lookup of oneback.test.ex (A) using fakens
DNS lookup of oneback.test.ex (A) succeeded
oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx
checking addresses for oneback.test.ex
Forward DNS security status: unverified
V4NET.99.99.90 OK
- writing neg-cache entry for host1.masq.test.ex-AAAA-41, ttl 3600
DNS lookup of host1.masq.test.ex (A) using fakens
DNS lookup of host1.masq.test.ex (A) succeeded
host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx
diff --git a/test/stderr/0278 b/test/stderr/0278
index 6e2fa35..ae86f8c 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -292,7 +292,6 @@ DNS lookup of test.ex (MX) using fakens
DNS lookup of test.ex (MX) gave NO_DATA
returning DNS_NODATA
writing neg-cache entry for test.ex-MX-c1, ttl 3600
- writing neg-cache entry for test.ex-AAAA-c1, ttl 3600
DNS lookup of test.ex (A) using fakens
DNS lookup of test.ex (A) gave NO_DATA
returning DNS_NODATA
diff --git a/test/stderr/0361 b/test/stderr/0361
index 8846bea..81d9778 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -105,7 +105,6 @@ DNS lookup of recurse.test.ex.test.ex (MX) using fakens
DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
returning DNS_NODATA
writing neg-cache entry for recurse.test.ex.test.ex-MX-c1, ttl 3600
- writing neg-cache entry for recurse.test.ex.test.ex-AAAA-c1, ttl 3600
DNS lookup of recurse.test.ex.test.ex (A) using fakens
DNS lookup of recurse.test.ex.test.ex (A) succeeded
fully qualified name = recurse.test.ex.test.ex
diff --git a/test/stderr/0381 b/test/stderr/0381
index 62a0137..42b52d0 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -41,14 +41,12 @@ DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "x.gov.uk.test.ex"
alias "x.co.uk.test.ex"
- writing neg-cache entry for x.gov.uk.test.ex-AAAA-41, ttl 3600
DNS lookup of x.gov.uk.test.ex (A) using fakens
DNS lookup of x.gov.uk.test.ex (A) succeeded
x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
checking addresses for x.gov.uk.test.ex
Forward DNS security status: unverified
V4NET.99.99.97 OK
- writing neg-cache entry for x.co.uk.test.ex-AAAA-41, ttl 3600
DNS lookup of x.co.uk.test.ex (A) using fakens
DNS lookup of x.co.uk.test.ex (A) succeeded
x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
diff --git a/test/stderr/0419 b/test/stderr/0419
index 636015b..8aba8f1 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,10 +24,8 @@ dnslookup router called for k@???
domain = mxt13.test.ex
DNS lookup of mxt13.test.ex (MX) using fakens
DNS lookup of mxt13.test.ex (MX) succeeded
- writing neg-cache entry for other1.test.ex-AAAA-41, ttl 3600
DNS lookup of other1.test.ex (A) using fakens
DNS lookup of other1.test.ex (A) succeeded
- writing neg-cache entry for other2.test.ex-AAAA-41, ttl 3600
DNS lookup of other2.test.ex (A) using fakens
DNS lookup of other2.test.ex (A) succeeded
other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
diff --git a/test/stderr/0463 b/test/stderr/0463
index 694d9df..48b2d4b 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -29,7 +29,6 @@ DNS lookup of ten-1 (MX) using fakens
DNS lookup of ten-1 (MX) gave NO_DATA
returning DNS_NODATA
writing neg-cache entry for ten-1-MX-c1, ttl 3600
- writing neg-cache entry for ten-1-AAAA-c1, ttl 3600
DNS lookup of ten-1 (A) using fakens
DNS lookup of ten-1 (A) succeeded
fully qualified name = ten-1.test.ex
@@ -57,7 +56,6 @@ DNS lookup of ten-1.test.ex (MX) using fakens
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
- writing neg-cache entry for ten-1.test.ex-AAAA-c1, ttl 3600
DNS lookup of ten-1.test.ex (A) using fakens
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
diff --git a/test/stderr/4802 b/test/stderr/4802
index 8f25c05..9575f88 100644
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -4,7 +4,6 @@ admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
- writing neg-cache entry for a-aa.test.ex-AAAA-800041, ttl 3600
DNS lookup of a-aa.test.ex (A) using fakens
DNS lookup of a-aa.test.ex (A) succeeded
DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
@@ -16,7 +15,6 @@ dropping to exim gid; retaining priv uid
DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
- writing neg-cache entry for a-sec.test.ex-AAAA-800041, ttl 3600
DNS lookup of a-sec.test.ex (A) using fakens
DNS lookup of a-sec.test.ex (A) succeeded
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/4803 b/test/stderr/4803
index dd4d99f..a7aa7bf 100644
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -4,7 +4,6 @@ admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
- writing neg-cache entry for a-aa.test.ex-AAAA-800041, ttl 3600
DNS lookup of a-aa.test.ex (A) using fakens
DNS lookup of a-aa.test.ex (A) succeeded
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
@@ -20,7 +19,6 @@ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
- writing neg-cache entry for a-sec.test.ex-AAAA-800041, ttl 3600
DNS lookup of a-sec.test.ex (A) using fakens
DNS lookup of a-sec.test.ex (A) succeeded
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
