Fix listing a named queue by a non-admin user. Bug 2398

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

diff --git a/test/scripts/0000-Basic/0099 b/test/scripts/0000-Basic/0099
index d770eef544f20e60826165a2b593b51644899ff9..c6df9b7ddcb2d066ec374e5f1f9032ebf431913f 100644 (file)
--- a/test/scripts/0000-Basic/0099
+++ b/test/scripts/0000-Basic/0099
@@ -1,5 +1,8 @@
 # retry data
 # retry data

-exim -odi userx@far.away.ex
+#
+#
+# This should add an entry for "thishost.test.ex"
+exim -odi userx@simple

 Test message
 ****
 dump retry
 Test message
 ****
 dump retry


@@ -10,7 +13,46 @@ dump retry
 sleep 3
 exim -odi -q
 ****
 sleep 3
 exim -odi -q
 ****

+#
+# This should add two entries for "thisloop.test.ex" (ip4, 127.0.0.1)
+exim -odi usery@complex
+Test message 2
+****
+dump retry
+#
+# and one for thishost without its IP
+exim -odi -DRETRY=retry_include_ip_address=no userz@simple
+Test message
+****
+dump retry
+#
+# expanded option, giving true, should leave the localhost pair unchanged
+exim -odi -DRETRY='retry_include_ip_address=${if eq{with}{$local_part} {yes}{no}}' with@complex
+Test message
+****
+dump retry
+#
+# 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
 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@a.b.c
 exim -brt x@dark.star.ex
 ****
 exim -brt x@a.b.c


@@ -39,3 +81,10 @@ exim -f "" -brt x@Q.abcd.ex
 ****
 exim -f "d@e.f" -brt x@Q.abcd.ex
 ****
 ****
 exim -f "d@e.f" -brt x@Q.abcd.ex
 ****

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