Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stdout / 4600

diff --git a/test/stdout/4600 b/test/stdout/4600
index a0d3eed8bb7abfaf29027712f7e30eb05fd59ddc..e686fee12cc923ff43245d5b185716680bc0c18d 100644 (file)
--- a/test/stdout/4600
+++ b/test/stdout/4600
@@ -68,12 +68,12 @@ Connecting to 127.0.0.1 port 1226 ... connected
 <<< 550 Administrative prohibition
 >>> quit
 End of script
 <<< 550 Administrative prohibition
 >>> quit
 End of script

-Connecting to 127.0.0.1 port 1224 ... connected
+Connecting to ip4.ip4.ip4.ip4 port 1224 ... connected

 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> helo example.com
+>>> helo passme.helo.example.com

 ??? 250
 ??? 250

-<<< 250 myhost.test.ex Hello example.com [127.0.0.1]
+<<< 250 myhost.test.ex Hello passme.helo.example.com [ip4.ip4.ip4.ip4]

 >>> mail from:<>
 ??? 250
 <<< 250 OK
 >>> mail from:<>
 ??? 250
 <<< 250 OK


@@ -82,3 +82,17 @@ Connecting to 127.0.0.1 port 1224 ... connected
 <<< 250 Accepted
 >>> quit
 End of script
 <<< 250 Accepted
 >>> quit
 End of script

+Connecting to ip4.ip4.ip4.ip4 port 1224 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo passme.helo.example.com
+??? 250
+<<< 250 myhost.test.ex Hello passme.helo.example.com [ip4.ip4.ip4.ip4]
+>>> mail from:<failme@example.com>
+??? 250
+<<< 250 OK
+>>> rcpt to:<fred@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> quit
+End of script