Testsuite: fix 0173 + 2100+, take 2

[users/heiko/exim.git] / test / confs / 0099

diff --git a/test/confs/0099 b/test/confs/0099
index 3f72adb6948b513dc46a2d7d7e90eeacdeaff5b3..8b4299130b65253f594e54dd769b628ccf08de86 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -2,31 +2,35 @@
 
 RETRY =
 
 
 RETRY =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s
 
 # ----- Main settings -----
 
 primary_hostname = primary.test.ex
 qualify_domain = test.ex
 retry_data_expire = 2s

+log_selector = +received_recipients

 
 
 # ----- Routers -----
 
 begin routers
 
 
 
 # ----- Routers -----
 
 begin routers
 

+bydns:
+  driver = dnslookup
+  domains = mxt2.test.ex : mxnonexist.test.ex
+  transport = smtp
+  fail_defer_domains = *
+

 all:
   driver = manualroute
   route_list = simple  thishost.test.ex  byname \
 all:
   driver = manualroute
   route_list = simple  thishost.test.ex  byname \

-            ; complex localhost.test.ex byname \
+            ; complex thisloop.test.ex  byname \
+            ; nonexist nonexist.test.ex byname \

             ; *       127.0.0.1         byname
   self = send
             ; *       127.0.0.1         byname
   self = send

+  host_find_failed = defer

   transport = smtp
 
 
   transport = smtp
 
 


@@ -50,6 +54,7 @@ begin retry
 rcpt45x.test.ex              rcpt_45x      F,10d,2m
 rcpt463.test.ex              rcpt_463      F,10d,3m
 rcpt4xx.test.ex              rcpt_4xx      F,10d,1m
 rcpt45x.test.ex              rcpt_45x      F,10d,2m
 rcpt463.test.ex              rcpt_463      F,10d,3m
 rcpt4xx.test.ex              rcpt_4xx      F,10d,1m

+*                            lookup        F,10d,30m

 
 *@\N^\d                      *             F,5d,1m
 *@*.abcd.ex                  *             F,5d,2m
 
 *@\N^\d                      *             F,5d,1m
 *@*.abcd.ex                  *             F,5d,2m