summaryrefslogtreecommitdiff
path: root/test/confs/5902
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-10-15 18:56:16 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2016-10-15 18:56:16 +0100
commit80bbefb8dbd9a7fc548d9beeb8d9f236c00a51a0 (patch)
tree5221c7de6a037b4e8e63c2f420faa16f59f8eb00 /test/confs/5902
parent3369a853fbc0fe454ac65fef7adf7e51845ff6a2 (diff)
Testsuite: for queuefile transport, avoid using named-queues as part of test
Also avoid using aux-var as a testing temporary area
Diffstat (limited to 'test/confs/5902')
-rw-r--r--test/confs/590230
1 files changed, 7 insertions, 23 deletions
diff --git a/test/confs/5902 b/test/confs/5902
index e7dad63a7..ba4acc29f 100644
--- a/test/confs/5902
+++ b/test/confs/5902
@@ -1,35 +1,26 @@
# Exim test configuration 5902
+OPT=
+
.include DIR/aux-var/std_conf_prefix
# ----- Main settings -----
qualify_domain = test.ex
-acl_smtp_rcpt = rcpt
-
-# ----- ACLs -----
-
-begin acl
-
-rcpt:
- accept
- queue = ${if eq {normal}{$local_part} {} {$local_part}}
- logwrite = using queue '$queue_name'
# ----- Routers -----
begin routers
-local:
- driver = accept
- transport = local_delivery
- condition = ${if eq {}{$queue_name} {1}{0}}
-
scan:
driver = accept
+ condition = ${if eq {OPT}{scan} {y}}
transport = scan
+local:
+ driver = accept
+ transport = local_delivery
# ----- Transports -----
@@ -37,18 +28,11 @@ begin transports
scan:
driver = queuefile
- directory = DIR/aux-fixed/5902/outbound
+ directory = DIR/scanner
local_delivery:
driver = appendfile
file = DIR/test-mail/$local_part
user = CALLER
-# ----- Retry -----
-
-begin retry
-
-* * F,10m,2d
-
-
# End