Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0099

diff --git a/test/scripts/0000-Basic/0099 b/test/scripts/0000-Basic/0099
index 6dfc14a04eeb742534ce4ec2b139fb0565e44c66..c6df9b7ddcb2d066ec374e5f1f9032ebf431913f 100644 (file)
--- a/test/scripts/0000-Basic/0099
+++ b/test/scripts/0000-Basic/0099
@@ -14,7 +14,7 @@ sleep 3
 exim -odi -q
 ****
 #
 exim -odi -q
 ****
 #

-# This should add two entries for "localhost.test.ex" (ipv4, ipv6)
+# This should add two entries for "thisloop.test.ex" (ip4, 127.0.0.1)

 exim -odi usery@complex
 Test message 2
 ****
 exim -odi usery@complex
 Test message 2
 ****


@@ -32,12 +32,26 @@ Test message
 ****
 dump retry
 #
 ****
 dump retry
 #

-# expanded option, giving false, should add another localhost entry, without IP
+# expanded option, giving false, should add another 'thisloop.test.ex' entry, without IP

 exim -odi -DRETRY='retry_include_ip_address=${if eq{with}{$local_part} {yes}{no}}' without@complex
 Test message
 ****
 dump retry
 #
 exim -odi -DRETRY='retry_include_ip_address=${if eq{with}{$local_part} {yes}{no}}' without@complex
 Test message
 ****
 dump retry
 #

+# a lookup-failure (in manualroute)
+exim -odi userx@nonexist
+Test message
+****
+# 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
+#

 #
 exim -brt x@dark.star.ex
 ****
 #
 exim -brt x@dark.star.ex
 ****


@@ -69,3 +83,8 @@ exim -f "d@e.f" -brt x@Q.abcd.ex
 ****
 exim -brt x@not.not.ex
 ****
 ****
 exim -brt x@not.not.ex
 ****

+exim -brt x@nonexist.test.ex lookup
+****
+#
+#
+no_msglog_check