Merge branch 'master' into 4.next

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0574

diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574
index 7fe6ddb05f54e9113e7128241ac9aa392e5efda8..6784bde56d19fd99e343793f62bd723d1bbfafab 100644 (file)
--- a/test/scripts/0000-Basic/0574
+++ b/test/scripts/0000-Basic/0574
@@ -1,52 +1,37 @@
-# named queues
-# Exim test configuration 0574
+# debug logging ACL modifier
+munge debuglog_stdout
 #
-no_msglog_check
+exim -DSERVER=server -bd -oX PORT_D
+****
 #
-exim -bs
-MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO: <normal@test.ex>
-DATA
-Subject: test
-
-foo
-.
-RSET
-MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO: <alternate@test.ex>
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test.ex
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+MAIL FROM:<tester@test.ex>
+??? 250
+RCPT TO:<dest@test.ex>
+??? 250
 DATA
+??? 354
 Subject: test
 
-foo
+body
 .
+??? 250
 QUIT
+??? 221
 ****
 #
-exim -qq
-****
-#
-exim -qGnosuchqueue
-****
-#
-exim -qGalternate
-****
-#
+killdaemon
 #
+1
+cat DIR/spool/log/serverdebuglog_1
 #
-exim -DSERVER=server -qGlowpri/3s
-****
-sleep 1
-exim -bs
-MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO: <lowpri@test.ex>
-DATA
-Subject: test 
-
-foo
-.
-QUIT
-****
-#
-sleep 3
+cat DIR/spool/log/serverdebuglog_2
 #
-killdaemon
+no_msglog_check