Testsuite: sort output of retry DB dumps

[users/heiko/exim.git] / test / scripts / 5400-cutthrough / 5400

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index ccf5e7429a136de73d9a54b293e977270c2a7cd7..3e56b43b84e8e5413ec2c29be03d19dc4568dada 100644 (file)
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -18,7 +18,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex

-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>

 RCPT TO:<userx@domain.com>
 DATA
 
 RCPT TO:<userx@domain.com>
 DATA
 


@@ -26,8 +26,6 @@ DATA
 QUIT
 ****
 # cutthrough_delivery into HELO-only server
 QUIT
 ****
 # cutthrough_delivery into HELO-only server

-need_ipv4
-#

 server PORT_S
 220 SMTP only spoken here
 EHLO
 server PORT_S
 220 SMTP only spoken here
 EHLO


@@ -47,7 +45,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex

-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>

 RCPT TO:<userz@domain.com>
 DATA
 
 RCPT TO:<userz@domain.com>
 DATA
 


@@ -83,7 +81,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex

-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>

 RCPT TO:<usery@domain.com>
 RCPT TO:<userx@domain.com>
 DATA
 RCPT TO:<usery@domain.com>
 RCPT TO:<userx@domain.com>
 DATA


@@ -92,3 +90,36 @@ DATA
 QUIT
 ****
 sleep 1
 QUIT
 ****
 sleep 1

+#
+#
+#
+#
+#
+# cutthrough_delivery basic operation, again
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
+250 OK
+QUIT
+250 OK
+****
+exim -d-all+acl+transport -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<userx@domain.com>
+DATA
+X-hdr-rtr: qqq
+X-hdr-tpt: zzz
+
+body
+.
+QUIT
+****