Gitweb:
https://git.exim.org/exim.git/commitdiff/da0b4ba788278c1703a0c277a8f4a75052d1b1e5
Commit: da0b4ba788278c1703a0c277a8f4a75052d1b1e5
Parent: 3462da30c9c57e63705fa24121655a32b315dfcf
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Sep 5 16:47:41 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Sep 5 16:47:41 2019 +0100
Testsuite: drop test.ex domain neg-cache ttl to 3000
---
test/dnszones-src/db.test.ex | 2 +-
test/stderr/0023 | 4 ++--
test/stderr/0044 | 4 ++--
test/stderr/0138 | 4 ++--
test/stderr/0139 | 6 +++---
test/stderr/0183 | 10 +++++-----
test/stderr/0278 | 4 ++--
test/stderr/0361 | 4 ++--
test/stderr/0463 | 8 ++++----
test/stderr/0545 | 4 ++--
test/stderr/1006 | 8 ++++----
test/stderr/2201 | 2 +-
test/stdout/2200 | 2 +-
13 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index be51093..d1bc8e9 100644
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -20,7 +20,7 @@
; and description.
test.ex. NS exim.test.ex.
-test.ex. SOA exim.test.ex. hostmaster.exim.test.ex 1430683638 1200 120 604800 3600
+test.ex. SOA exim.test.ex. hostmaster.exim.test.ex 1430683638 1200 120 604800 3000
test.ex. TXT "A TXT record for test.ex."
s/lash TXT "A TXT record for s/lash.test.ex."
diff --git a/test/stderr/0023 b/test/stderr/0023
index 140fc7a..cca600f 100644
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -688,7 +688,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
>>> check dnslists = rbl.test.ex
>>> dnslists check: rbl.test.ex
>>> new DNS lookup for 12.12.11.V4NET.rbl.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 12.12.11.V4NET.rbl.test.ex failed
>>> => that means V4NET.11.12.12 is not listed at rbl.test.ex
>>> deny: condition test failed in ACL "acl_V4NET_11_12"
@@ -1184,7 +1184,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
>>> = test.ex/elsewhere
>>> dnslists check: test.ex/elsewhere
>>> new DNS lookup for elsewhere.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for elsewhere.test.ex failed
>>> => that means elsewhere is not listed at test.ex
>>> deny: condition test failed in ACL "acl_29_29_29"
diff --git a/test/stderr/0044 b/test/stderr/0044
index 0a2b983..6359bd3 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -240,8 +240,8 @@ new DNS lookup for 99.99.99.V4NET.rbl.test.ex
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) using fakens
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
- writing neg-cache entry for 99.99.99.V4NET.rbl.test.ex-A-xxxx, ttl 5
-dnslists: wrote cache entry, ttl=5
+ writing neg-cache entry for 99.99.99.V4NET.rbl.test.ex-A-xxxx, ttl 3000
+dnslists: wrote cache entry, ttl=3000
DNS lookup for 99.99.99.V4NET.rbl.test.ex failed
=> that means V4NET.99.99.99 is not listed at rbl.test.ex
deny: condition test failed in ACL "check_recipient"
diff --git a/test/stderr/0138 b/test/stderr/0138
index ed7121b..38e862c 100644
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -72,7 +72,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? H=(exim.test.ex) [V4NET.11.12.1
>>> check dnslists = rbl3.test.ex
>>> dnslists check: rbl3.test.ex
>>> new DNS lookup for 13.12.11.V4NET.rbl3.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 13.12.11.V4NET.rbl3.test.ex failed
>>> => that means V4NET.11.12.13 is not listed at rbl3.test.ex
>>> accept: condition test failed in ACL "check_recipient"
@@ -81,7 +81,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? H=(exim.test.ex) [V4NET.11.12.1
>>> check dnslists = rbl2.test.ex
>>> dnslists check: rbl2.test.ex
>>> new DNS lookup for 13.12.11.V4NET.rbl2.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 13.12.11.V4NET.rbl2.test.ex failed
>>> => that means V4NET.11.12.13 is not listed at rbl2.test.ex
>>> deny: condition test failed in ACL "check_recipient"
diff --git a/test/stderr/0139 b/test/stderr/0139
index 1e94516..9b01d9d 100644
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -11,7 +11,7 @@
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
@@ -143,7 +143,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@??? H=[V4NET.11.12.14] P=smtp S=sss
>>> check dnslists = rbl4.test.ex&0.0.0.6
>>> dnslists check: rbl4.test.ex&0.0.0.6
>>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
>>> warn: condition test failed in ACL "check_mail"
@@ -294,7 +294,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@???> rejected RCPT <userx@???
>>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3
>>> dnslists check: rbl2.test.ex!=127.0.0.3
>>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex
->>> dnslists: wrote cache entry, ttl=3600
+>>> dnslists: wrote cache entry, ttl=3000
>>> DNS lookup for 15.12.11.V4NET.rbl2.test.ex failed
>>> => that means V4NET.11.12.15 is not listed at rbl2.test.ex
>>> dnslists check: rbl3.test.ex=127.0.0.3
diff --git a/test/stderr/0183 b/test/stderr/0183
index e9a91f4..44f567b 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -89,7 +89,7 @@ lookuphost router called for abcd@???
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
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
@@ -290,7 +290,7 @@ lookuphost router called for abcd@???
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
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
@@ -435,7 +435,7 @@ lookuphost router called for userx@???
DNS lookup of nonexist.test.ex (MX) using fakens
DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
- writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3000
lookuphost router declined for userx@???
"more" is false: skipping remaining routers
no more routers
@@ -492,7 +492,7 @@ lookuphost router called for abcd@???
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
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
@@ -534,7 +534,7 @@ doing DNS lookup
DNS lookup of nonexist.test.ex (A) using fakens
DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
- writing neg-cache entry for nonexist.test.ex-A-xxxx, ttl 3600
+ writing neg-cache entry for nonexist.test.ex-A-xxxx, ttl 3000
useryz router: defer for usery@???
message: lookup of host "nonexist.test.ex" failed in useryz router
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0278 b/test/stderr/0278
index cb6800c..f8219ff 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -291,11 +291,11 @@ r2 router called for unknown@???
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-xxxx, ttl 3600
+ writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
DNS lookup of test.ex (A) using fakens
DNS lookup of test.ex (A) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for test.ex-A-xxxx, ttl 3600
+ writing neg-cache entry for test.ex-A-xxxx, ttl 3000
r2 router declined for unknown@???
--------> r3 router <--------
local_part=unknown domain=test.ex
diff --git a/test/stderr/0361 b/test/stderr/0361
index dd9b3be..5081d02 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -99,12 +99,12 @@ r1 router called for kilos@???
DNS lookup of recurse.test.ex (MX) using fakens
DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
- writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
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-xxxx, ttl 3600
+ writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
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/0463 b/test/stderr/0463
index 0aea730..4dc2144 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -19,7 +19,7 @@ checking domains
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
Address records are not being sought
ten-1 in "!@mx_any"? yes (end of list)
calling all router
@@ -28,7 +28,7 @@ all router called for x@ten-1
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
DNS lookup of ten-1 (A) using fakens
DNS lookup of ten-1 (A) succeeded
fully qualified name = ten-1.test.ex
@@ -46,7 +46,7 @@ checking domains
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
Address records are not being sought
ten-1.test.ex in "!@mx_any"? yes (end of list)
calling all router
@@ -55,7 +55,7 @@ all router called for x@???
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-xxxx, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
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/0545 b/test/stderr/0545
index 107bcca..d998769 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -24,7 +24,7 @@ CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (MX) using fakens
DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
DNS lookup of alias-eximtesthost (A) using fakens
DNS lookup of alias-eximtesthost (A) succeeded
CNAME found: change to eximtesthost.test.ex
@@ -95,7 +95,7 @@ CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (MX) using fakens
DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
DNS lookup of alias-eximtesthost.test.ex (A) using fakens
DNS lookup of alias-eximtesthost.test.ex (A) succeeded
CNAME found: change to eximtesthost.test.ex
diff --git a/test/stderr/1006 b/test/stderr/1006
index e7bf00e..d569343 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -13,12 +13,12 @@ DNS lookup of 46.test.ex (A) succeeded
DNS lookup of v6.test.ex (MX) using fakens
DNS lookup of v6.test.ex (MX) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
DNS lookup of v6.test.ex (AAAA) succeeded
DNS lookup of v6.test.ex (A) using fakens
DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3600
+ writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -33,11 +33,11 @@ DNS lookup of 46.test.ex (A) succeeded
DNS lookup of v6.test.ex (MX) using fakens
DNS lookup of v6.test.ex (MX) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3600
+ writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
DNS lookup of v6.test.ex (A) using fakens
DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3600
+ writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/2201 b/test/stderr/2201
index ff018f3..23ac937 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -99,7 +99,7 @@ dnsdb key: unknown
DNS lookup of unknown (TXT) using fakens
DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
returning DNS_NOMATCH
- writing neg-cache entry for unknown-TXT-xxxx, ttl 3600
+ writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
lookup failed
unknown in "dnsdb;unknown"? no (end of list)
r1 router skipped: local_parts mismatch
diff --git a/test/stdout/2200 b/test/stdout/2200
index 202cadf..766d433 100644
--- a/test/stdout/2200
+++ b/test/stdout/2200
@@ -20,7 +20,7 @@
> csa=csa2.test.ex N csa2.test.ex
>
> soa=test.ex exim.test.ex
-> soa=a.test.ex exim.test.ex hostmaster.exim.test.ex 1430683638 1200 120 604800 3600
+> soa=a.test.ex exim.test.ex hostmaster.exim.test.ex 1430683638 1200 120 604800 3000
>
> # DNS lookups with multiple items
>
