Merge from master into 4.next

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

diff --git a/test/scripts/0000-Basic/0420 b/test/scripts/0000-Basic/0420
index c61a23d1ecb6cf83024f094a2aee2ef3e3e8b030..2f7fe499860b91668ed8baffe1e2ed6296b25834 100644 (file)
--- a/test/scripts/0000-Basic/0420
+++ b/test/scripts/0000-Basic/0420
@@ -1,14 +1,31 @@
 # received_header_text
 # received_header_text

-exim -d -bh V4NET.0.0.0
+exim -bd -DSERVER=server -oX PORT_D
+****
+#
+client 127.0.0.1 PORT_D
+??? 220
+helo client.test.ex
+??? 250

 mail from:<x@y>
 mail from:<x@y>

+??? 250

 rcpt to:<x@y>
 rcpt to:<x@y>

+??? 250

 data
 data

+??? 354

 Message.
 .
 Message.
 .

+??? 250

 mail from:<a@b>
 mail from:<a@b>

+??? 250

 rcpt to:<x@y>
 rcpt to:<x@y>

+??? 250

 data
 data

+??? 354

 Message.
 .
 Message.
 .

+??? 250

 quit
 quit

+??? 221

 ****
 ****

+#
+killdaemon