diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-06 18:28:18 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-06 21:51:20 +0100 |
| commit | 1435d4b244871b65c6bb07878ddd2241ae8d2545 (patch) | |
| tree | d59a3578589ef7f99d60557307fbceb37d62b7b7 /test | |
| parent | 9960d1e59f08254a951283981d4a32c73ca7d3ad (diff) | |
Routing: in a dnslookup, fix fail_defer_domains to defer on missing MX record. Bug 1867
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0099 | 2 | ||||
| -rw-r--r-- | test/log/0099 | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0099 | 8 | ||||
| -rw-r--r-- | test/stdout/0099 | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/test/confs/0099 b/test/confs/0099 index 8db58dcb0..8b4299130 100644 --- a/test/confs/0099 +++ b/test/confs/0099 @@ -19,7 +19,7 @@ begin routers bydns: driver = dnslookup - domains = mxt2.test.ex + domains = mxt2.test.ex : mxnonexist.test.ex transport = smtp fail_defer_domains = * diff --git a/test/log/0099 b/test/log/0099 index 4b6439219..13a1916c1 100644 --- a/test/log/0099 +++ b/test/log/0099 @@ -25,4 +25,6 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 no IP address found for host nonexist.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@nonexist R=all defer (-32): lookup of host "nonexist.test.ex" failed in all router 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for userx@mxt2.test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 == userx@mxt2.test.ex R=bydns defer (-32): all relevant MX records point to non-existent hosts +1999-03-02 09:44:33 10HmbD-0005vi-00 == userx@mxt2.test.ex R=bydns defer (-1): missing MX, or all MXs point to missing A records, and defer requested +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for userx@mxnonexist.test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 == userx@mxnonexist.test.ex R=bydns defer (-1): missing MX, or all MXs point to missing A records, and defer requested diff --git a/test/scripts/0000-Basic/0099 b/test/scripts/0000-Basic/0099 index c386e1e85..d6655dcf9 100644 --- a/test/scripts/0000-Basic/0099 +++ b/test/scripts/0000-Basic/0099 @@ -38,14 +38,18 @@ Test message **** dump retry # -# one for a lookup-failure (in manualroute) +# a lookup-failure (in manualroute) exim -odi userx@nonexist Test message **** -# one for a lookup-failure (in dnslookup) +# a lookup-failure (good MX, missing A) in dnslookup, deferred exim -odi userx@mxt2.test.ex Test message **** +# a lookup-failure (missing MX) in dnslookup, deferred +exim -odi userx@mxnonexist.test.ex +Test message +**** dump retry # # diff --git a/test/stdout/0099 b/test/stdout/0099 index 0f6f7f2fa..e14fa0a35 100644 --- a/test/stdout/0099 +++ b/test/stdout/0099 @@ -41,8 +41,10 @@ first failed = time last try = time2 next try = time2 + 900 T:thisloop.test.ex:999 dd 65 Connection refused first failed = time last try = time2 next try = time2 + 900 +++++++++++++++++++++++++++ - R:mxt2.test.ex -32 0 all relevant MX records point to non-existent hosts -first failed = time last try = time2 next try = time2 + 1800 + R:mxnonexist.test.ex -1 0 missing MX, or all MXs point to missing A records, and defer requested +first failed = time last try = time2 next try = time2 + 900 + R:mxt2.test.ex -1 0 missing MX, or all MXs point to missing A records, and defer requested +first failed = time last try = time2 next try = time2 + 900 R:nonexist -32 0 lookup of host "nonexist.test.ex" failed in all router first failed = time last try = time2 next try = time2 + 1800 T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused |