Make the retry_include_ip_address smtp transport option expanded. Bug 1545

[exim.git] / test / confs / 0099

diff --git a/test/confs/0099 b/test/confs/0099
index e35ad5fcfbf89e54c76c1c6e5001a791244fc30d..3f72adb6948b513dc46a2d7d7e90eeacdeaff5b3 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -1,5 +1,7 @@
 # Exim test configuration 0099
 
 # Exim test configuration 0099
 

+RETRY =
+

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s


@@ -21,7 +23,9 @@ begin routers
 
 all:
   driver = manualroute
 
 all:
   driver = manualroute

-  route_list = "* 127.0.0.1 byname"
+  route_list = simple  thishost.test.ex  byname \
+            ; complex localhost.test.ex byname \
+            ; *       127.0.0.1         byname

   self = send
   transport = smtp
 
   self = send
   transport = smtp
 


@@ -33,6 +37,7 @@ begin transports
 smtp:
   driver = smtp
   port = 999
 smtp:
   driver = smtp
   port = 999

+  RETRY

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----


@@ -54,6 +59,7 @@ rcpt4xx.test.ex              rcpt_4xx      F,10d,1m
 *@@                          *             F,5d,6m
 lsearch*@;DIR/aux-fixed/TESTNUM.rlist  *             F,1d,3m
 *.star.ex                    *             F,3d,10m
 *@@                          *             F,5d,6m
 lsearch*@;DIR/aux-fixed/TESTNUM.rlist  *             F,1d,3m
 *.star.ex                    *             F,3d,10m

-*                            *             F,2d,15m
+!*.not.ex                    *             F,2d,15m
+*                            *             F,12d,150m

 
 # End
 
 # End