Fix local delivery delay when combined with remote callout/hold. Bug 2599

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

diff --git a/test/confs/0580 b/test/confs/0580
index 6dbc06d64242e5e48765e17c35e69dd79110d48c..a96b01162e6d92b1e9cddd388ca5371d5dd89673 100644 (file)
--- a/test/confs/0580
+++ b/test/confs/0580
@@ -18,28 +18,44 @@ OPT
 begin acl
 
 check_rcpt:
 begin acl
 
 check_rcpt:

-  accept  verify = recipient/callout=use_sender,hold
+  accept
+       local_parts =   delay : remote
+       verify =        recipient/callout=2s,use_sender,defer_ok,hold

 
 

+  accept
+       local_parts =   local
+
+  accept
+       verify = recipient/callout=use_sender,hold

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

-r1:
-  driver = manualroute
+r_local:
+  driver =     accept
+  local_parts =        local
+  transport =  local_deliv
+
+r_remote:
+  driver =     manualroute

   route_list = * 127.0.0.1
   route_list = * 127.0.0.1

-  self = send
-  transport = t1
+  self =       send
+  transport =  t1

 
 
 begin transports
 
 
 
 begin transports
 

+local_deliv:
+  driver =     appendfile
+  file =       DIR/test-mail/$local_part_data
+  user =       CALLER
+

 t1:
   driver = smtp
   port =   PORT_S
   hosts_try_fastopen = :
 
 t1:
   driver = smtp
   port =   PORT_S
   hosts_try_fastopen = :
 

-

 # ----- Retry -----
 begin retry
 
 # ----- Retry -----
 begin retry