summaryrefslogtreecommitdiff
path: root/test/scripts/5900-queuefile-transport
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/scripts/5900-queuefile-transport
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/scripts/5900-queuefile-transport')
-rw-r--r--test/scripts/5900-queuefile-transport/590233
1 files changed, 17 insertions, 16 deletions
diff --git a/test/scripts/5900-queuefile-transport/5902 b/test/scripts/5900-queuefile-transport/5902
index 4b2a9a611..77c1db215 100644
--- a/test/scripts/5900-queuefile-transport/5902
+++ b/test/scripts/5900-queuefile-transport/5902
@@ -1,22 +1,23 @@
# 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
+# make a scanner dir for the transport to write into
+mkdir -p DIR/scanner
+sudo chown EXIMUSER:EXIMGROUP DIR/scanner
+#
+# this message should be placed by the queuefile transport in the scanner directory
+exim -DOPT=scan user1
****
-sleep 5
+sleep 1
#
-ls DIR/aux-fixed/5902/outbound
-sudo mv DIR/aux-fixed/5902/outbound/1* DIR/spool/input/
+# check it is there
+ls DIR/scanner
+#
+# then re-inject "after scanning" to the default queue and see it gets found
+# it should get an appendfile delivery becase it is from the default queue
+sudo mv DIR/scanner/* DIR/spool/input/
exim -q
+****
+#
+# tidy up
+sudo rm -fr DIR/scanner
no_msglog_check