Testsuite: avoid ipv6 when testing retry data

[exim.git] / test / stdout / 5400

diff --git a/test/stdout/5400 b/test/stdout/5400
index f06824a703be24c8f976ada0b235e494680b750e..4895072a3a0e24ea537bddface2e96ab12fe6523 100644 (file)
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -32,6 +32,17 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at myhost.test.ex\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbA-0005vi-00\r
+221 myhost.test.ex closing connection\r

 
 ******** SERVER ********
 Listening on port 1224 ... 
 
 ******** SERVER ********
 Listening on port 1224 ... 


@@ -39,7 +50,7 @@ Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
 EHLO myhost.test.ex
 250 OK
 220 ESMTP
 EHLO myhost.test.ex
 250 OK

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

 250 Sender OK
 RCPT TO:<userx@domain.com>
 250 Recipient OK
 250 Sender OK
 RCPT TO:<userx@domain.com>
 250 Recipient OK


@@ -53,6 +64,7 @@ Received: from CALLER (helo=myhost.test.ex)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+X-hdr-rtr-new: +++

 
 .
 250 OK
 
 .
 250 OK


@@ -66,7 +78,7 @@ EHLO myhost.test.ex
 550 Not here, mate
 HELO myhost.test.ex
 250 OK
 550 Not here, mate
 HELO myhost.test.ex
 250 OK

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

 250 Sender OK
 RCPT TO:<userz@domain.com>
 250 Recipient OK
 250 Sender OK
 RCPT TO:<userz@domain.com>
 250 Recipient OK


@@ -80,6 +92,7 @@ Received: from CALLER (helo=myhost.test.ex)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+X-hdr-rtr-new: +++

 
 .
 250 OK
 
 .
 250 OK


@@ -91,7 +104,7 @@ Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
 EHLO myhost.test.ex
 250 OK
 220 ESMTP
 EHLO myhost.test.ex
 250 OK

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

 250 Sender OK
 RCPT TO:<usery@domain.com>
 250 Recipient OK
 250 Sender OK
 RCPT TO:<usery@domain.com>
 250 Recipient OK


@@ -117,7 +130,37 @@ Received: from CALLER (helo=myhost.test.ex)
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+X-hdr-rtr-new: +++
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER (helo=myhost.test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)
+       (envelope-from <CALLER@myhost.test.ex>)
+       id 10HmbA-0005vi-00
+       for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+X-hdr-tpt: zzz
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-hdr-rtr-new: +++
+

 
 

+body

 .
 250 OK
 QUIT
 .
 250 OK
 QUIT