New: queuefile transport, under EXPERIMENTAL_QUEUEFILE

16 files changed, 194 insertions, 0 deletions

diff --git a/test/confs/5900 b/test/confs/5900
new file mode 100644
index 000000000..f5766d49f
--- /dev/null
+++ b/test/confs/5900
@@ -0,0 +1,35 @@
+# Exim test configuration 5900
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+qualify_domain = test.ex
+
+
+# ----- Routers -----
+
+begin routers
+
+scan:
+   driver = accept
+   transport = scan
+
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = DIR/test-mail/subdir
+
+# ----- Retry -----
+
+begin retry
+
+* * F,10m,2d
+
+
+# End
diff --git a/test/confs/5901 b/test/confs/5901
new file mode 100644
index 000000000..5d57c1c73
--- /dev/null
+++ b/test/confs/5901
@@ -0,0 +1,35 @@
+# Exim test configuration 5901
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+qualify_domain = test.ex
+
+
+# ----- Routers -----
+
+begin routers
+
+scan:
+   driver = accept
+   transport = scan
+
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = test-mail/subdir
+
+# ----- Retry -----
+
+begin retry
+
+* * F,10m,2d
+
+
+# End
diff --git a/test/confs/5902 b/test/confs/5902
new file mode 100644
index 000000000..e7dad63a7
--- /dev/null
+++ b/test/confs/5902
@@ -0,0 +1,54 @@
+# Exim test configuration 5902
+
+.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
+   transport = scan
+
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = DIR/aux-fixed/5902/outbound
+
+local_delivery:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+# ----- Retry -----
+
+begin retry
+
+* * F,10m,2d
+
+
+# End
diff --git a/test/log/5900 b/test/log/5900
new file mode 100644
index 000000000..8b273b8a9
--- /dev/null
+++ b/test/log/5900
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory
diff --git a/test/log/5901 b/test/log/5901
new file mode 100644
index 000000000..6a3797abd
--- /dev/null
+++ b/test/log/5901
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute
diff --git a/test/log/5902 b/test/log/5902
new file mode 100644
index 000000000..6b45d9b73
--- /dev/null
+++ b/test/log/5902
@@ -0,0 +1,11 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 => normal <normal@test.ex> R=local T=local_delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 using queue 'user1'
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss Q=user1
+1999-03-02 09:44:33 10HmaY-0005vi-00 => user1 <user1@test.ex> Q=user1 R=scan T=scan
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmaY-0005vi-00 => user1 <user1@test.ex> R=local T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/mail/5902.user1.5902 b/test/mail/5902.user1.5902
new file mode 100644
index 000000000..3b6bde52a
--- /dev/null
+++ b/test/mail/5902.user1.5902
@@ -0,0 +1,12 @@
+From CALLER@test.ex Tue Mar 02 09:44:33 1999
+Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00
+	for user1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: test
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+foo
+
diff --git a/test/paniclog/5900 b/test/paniclog/5900
new file mode 100644
index 000000000..70058d78e
--- /dev/null
+++ b/test/paniclog/5900
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory
diff --git a/test/paniclog/5901 b/test/paniclog/5901
new file mode 100644
index 000000000..111bae495
--- /dev/null
+++ b/test/paniclog/5901
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute
diff --git a/test/scripts/5900-queuefile-transport/5900 b/test/scripts/5900-queuefile-transport/5900
new file mode 100644
index 000000000..3d905542d
--- /dev/null
+++ b/test/scripts/5900-queuefile-transport/5900
@@ -0,0 +1,4 @@
+# queuefile transport test non existant directory
+exim -odi userx
+****
+no_msglog_check
diff --git a/test/scripts/5900-queuefile-transport/5901 b/test/scripts/5900-queuefile-transport/5901
new file mode 100644
index 000000000..b0f74f0ab
--- /dev/null
+++ b/test/scripts/5900-queuefile-transport/5901
@@ -0,0 +1,4 @@
+# queuefile transport test relative directory
+exim -odi userx
+****
+no_msglog_check
diff --git a/test/scripts/5900-queuefile-transport/5902 b/test/scripts/5900-queuefile-transport/5902
new file mode 100644
index 000000000..4b2a9a611
--- /dev/null
+++ b/test/scripts/5900-queuefile-transport/5902
@@ -0,0 +1,22 @@
+# queuefile transport test delivery
+sudo chown EXIMUSER:EXIMGROUP DIR/aux-fixed/5902/outbound
+exim -odi normal
+****
+sleep 5
+#
+exim -bs
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO: <user1@test.ex>
+DATA
+Subject: test
+
+foo
+.
+QUIT
+****
+sleep 5
+# 
+ls DIR/aux-fixed/5902/outbound
+sudo mv DIR/aux-fixed/5902/outbound/1* DIR/spool/input/
+exim -q
+no_msglog_check
diff --git a/test/scripts/5900-queuefile-transport/REQUIRES b/test/scripts/5900-queuefile-transport/REQUIRES
new file mode 100644
index 000000000..f24c3ba19
--- /dev/null
+++ b/test/scripts/5900-queuefile-transport/REQUIRES
@@ -0,0 +1 @@
+support Experimental_QUEUEFILE
diff --git a/test/stderr/5900 b/test/stderr/5900
new file mode 100644
index 000000000..70058d78e
--- /dev/null
+++ b/test/stderr/5900
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory
diff --git a/test/stderr/5901 b/test/stderr/5901
new file mode 100644
index 000000000..111bae495
--- /dev/null
+++ b/test/stderr/5901
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute
diff --git a/test/stdout/5902 b/test/stdout/5902
new file mode 100644
index 000000000..a16696f25
--- /dev/null
+++ b/test/stdout/5902
@@ -0,0 +1,8 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmaY-0005vi-00

+221 the.local.host.name closing connection

+10HmaY-0005vi-00-D
+10HmaY-0005vi-00-H