From c456d9bb38922c3e5ff511b934a1b7a282935f75 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Tue, 13 Mar 2007 15:32:47 +0000 Subject: Add host_find_failed=ignore and host_all_ignored to manualroute. --- test/confs/0557 | 49 ++++++++++++++++++++++++++++++++++++++++++++ test/scripts/0000-Basic/0557 | 28 +++++++++++++++++++++++++ test/stderr/0557 | 2 ++ test/stdout/0536 | 8 ++++---- test/stdout/0557 | 16 +++++++++++++++ 5 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 test/confs/0557 create mode 100644 test/scripts/0000-Basic/0557 create mode 100644 test/stderr/0557 create mode 100644 test/stdout/0557 (limited to 'test') diff --git a/test/confs/0557 b/test/confs/0557 new file mode 100644 index 000000000..3b134db34 --- /dev/null +++ b/test/confs/0557 @@ -0,0 +1,49 @@ +# Exim test configuration 0557 + +X= +Y= +HOSTS= +HAI= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + + +# ----- Routers ----- + +begin routers + +r1: + driver = manualroute + route_list = * HOSTS +X host_find_failed = ignore +Y host_all_ignored = HAI + no_more + self = send + transport = t1 + +r2: + driver = accept + transport = t2 + + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + +t2: + driver = appendfile + file = /dev/null + +# End diff --git a/test/scripts/0000-Basic/0557 b/test/scripts/0000-Basic/0557 new file mode 100644 index 000000000..8e05b4719 --- /dev/null +++ b/test/scripts/0000-Basic/0557 @@ -0,0 +1,28 @@ +# host_find_failed=ignore +1 +exim -DX=# -DY=# -bt userx@test.ex +**** +1 +exim -DY=# -DHOSTS=a.non.exist -bt userx@test.ex +**** +1 +exim -DY=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex +**** +exim -DY=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex +**** +exim -DY=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex +**** +1 +exim -DHOSTS=a.non.exist -DHAI=defer -bt userx@test.ex +**** +2 +exim -DHOSTS=a.non.exist -DHAI=decline -bt userx@test.ex +**** +2 +exim -DHOSTS=a.non.exist -DHAI=fail -bt userx@test.ex +**** +exim -DHOSTS=a.non.exist -DHAI=pass -bt userx@test.ex +**** +1 +exim -DHOSTS=a.non.exist -DHAI=freeze -bt userx@test.ex +**** diff --git a/test/stderr/0557 b/test/stderr/0557 new file mode 100644 index 000000000..8e5906ca8 --- /dev/null +++ b/test/stderr/0557 @@ -0,0 +1,2 @@ +LOG: MAIN + error in r1 router: no host(s) specified for domain * diff --git a/test/stdout/0536 b/test/stdout/0536 index cc4ce1e60..1ec52de1e 100644 --- a/test/stdout/0536 +++ b/test/stdout/0536 @@ -22,10 +22,10 @@ 590 Main code 590 5.4.3 Main and extended code 550 Wrong code -451 Temporary local problem - please try later -490 Temporary local problem - please try later -490 4.4.3 Temporary local problem - please try later -451 Temporary local problem - please try later +451 No code +490 Main code +490 4.4.3 Main and extended code +451 Wrong code 221 myhost.test.ex closing connection 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 250-myhost.test.ex Hello CALLER at test.ex diff --git a/test/stdout/0557 b/test/stdout/0557 new file mode 100644 index 000000000..5077c0d0a --- /dev/null +++ b/test/stdout/0557 @@ -0,0 +1,16 @@ +userx@test.ex cannot be resolved at this time: error in r1 router: no host(s) specified for domain * +userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer +userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer +userx@test.ex + router = r1, transport = t1 + host 127.0.0.1 [127.0.0.1] +userx@test.ex + router = r1, transport = t1 + host 127.0.0.1 [127.0.0.1] + host 127.0.0.2 [127.0.0.2] +userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer +userx@test.ex is undeliverable: Unrouteable address +userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail +userx@test.ex + router = r2, transport = t2 +userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=freeze -- cgit v1.2.3