Fix list-expansion for various domainlists, having included sublist elements. Bug...

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

diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599
index aa712de2f252c227be48546ddfce7fb265e751b0..360d536c0df46fdd8c9020d3296b0e4e0d8e9497 100644 (file)
--- a/test/scripts/0000-Basic/0599
+++ b/test/scripts/0000-Basic/0599
@@ -1,76 +1,17 @@
-# control = queue/first_pass_route
+# udpsend
+#need_ipv4
 #
-exim -bd -DSERVER=server -oX PORT_D
-****
 #
-# First, control=queue_only - we expact the queue run to make separate connections
-client 127.0.0.1 PORT_D
-??? 220
-HELO me
-??? 250
-MAIL FROM:<CALLER@test.ex>
-??? 250
-RCPT TO:<queue_only_1@test.ex>
-??? 250
-DATA
-??? 354
-Subject: 1
-.
-??? 250
-RSET
-??? 250
-MAIL FROM:<CALLER@test.ex>
-??? 250
-RCPT TO:<queue_only_2@test.ex>
-??? 250
-DATA
-??? 354
-Subject: 2
-.
-??? 250
-QUIT
-****
-exim -q
-****
-exim -q
+perl aux-fixed/0601.udpserver
 ****
 #
-# Second, control=queue/first_pass_route - we expect the queue run to make only one
-# connection, and put both messages over it
-client 127.0.0.1 PORT_D
-??? 220
-HELO me
-??? 250
-MAIL FROM:<CALLER@test.ex>
-??? 250
-RCPT TO:<first_pass_route_1@test.ex>
-??? 250
-DATA
-??? 354
-Subject: 1
+exim -bs -odi
+mail from:someone@some.domain
+rcpt to:CALLER@HOSTNAME
+data
+This is a test message.
 .
-??? 250
-RSET
-??? 250
-MAIL FROM:<CALLER@test.ex>
-??? 250
-RCPT TO:<first_pass_route_2@test.ex>
-??? 250
-DATA
-??? 354
-Subject: 2
-.
-??? 250
-QUIT
-****
-# give time for the background routing in the exim daemon to complete
-sleep 1
-# then run the queue
-exim -q
-****
-exim -q
+quit
 ****
-#
-#
-killdaemon
+sleep 2
 no_msglog_check