Move the TLS resumption support from Experimental to mainline

[exim.git] / test / scripts / 5900-queuefile-transport / 5902

diff --git a/test/scripts/5900-queuefile-transport/5902 b/test/scripts/5900-queuefile-transport/5902
index 4b2a9a61144cb3dc08d459a6519995e1e89af1b9..77c1db2159a6bbe0525d603f7b1e8bb4437007f7 100644 (file)
--- 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