Testsuite: output changes resulting

[exim.git] / test / stdout / 4030

diff --git a/test/stdout/4030 b/test/stdout/4030
index 6e567fd2cf51250e7e9863df41c8bba7f094d796..5bfbdf5384937fcba554b49e43ff1079e6812289 100644 (file)
--- a/test/stdout/4030
+++ b/test/stdout/4030
@@ -1,3 +1,4 @@
+### non-prox plain receive

 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


@@ -18,11 +19,12 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
 >>> body
 >>> .
 ??? 250

-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaX-000000005vi-0000

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script

+### protocol v1 plain receive

 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> PROXY TCP4 127.0.0.2 127.42.42.42 64000 25
 ??? 220
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> PROXY TCP4 127.0.0.2 127.42.42.42 64000 25
 ??? 220


@@ -44,18 +46,19 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
 >>> body
 >>> .
 ??? 250

-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmaY-000000005vi-0000

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script

+### protocol v2 plain receive

 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected

->>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\xc0\xa8\x00\x0f\xc0\xa8\x00\x05\xc2\x95\x04\x01
+>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01

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

-<<< 250 myhost.test.ex Hello clientname [192.168.0.15]
+<<< 250 myhost.test.ex Hello clientname [127.0.0.2]

 >>> MAIL FROM:<e@test.ex>
 ??? 250
 <<< 250 OK
 >>> MAIL FROM:<e@test.ex>
 ??? 250
 <<< 250 OK


@@ -70,8 +73,25 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
 >>> body
 >>> .
 ??? 250

-<<< 250 OK id=10HmaZ-0005vi-00
+<<< 250 OK id=10HmaZ-000000005vi-0000
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+### proxy timeout
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> PROXY TCP4 127.0.0.2 127.42.42.42 64000 25
+??? 503
+<<< 503 Command refused, required Proxy negotiation failed

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script

+
+******** SERVER ********
+### non-prox plain receive
+### protocol v1 plain receive
+### protocol v2 plain receive
+### proxy timeout