Fix mismerge

[exim.git] / test / scripts / 4030-proxy-protocol / 4031

diff --git a/test/scripts/4030-proxy-protocol/4031 b/test/scripts/4030-proxy-protocol/4031
index ecf3e827b59b964b8cc3983a4e29562158069bba..55e8ba806645f35bd68b84bb6ef036e3e920dd49 100644 (file)
--- a/test/scripts/4030-proxy-protocol/4031
+++ b/test/scripts/4030-proxy-protocol/4031
@@ -14,7 +14,7 @@ QUIT
 ****
 ### protocol v1 receive
 exim -bh HOSTIPV4
 ****
 ### protocol v1 receive
 exim -bh HOSTIPV4

->>> PROXY TCP4 127.0.0.2 127.42.42.42 64000 25\r\n
+:eval:PROXY TCP4 127.0.0.2 127.42.42.42 64000 25\r\n

 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>
 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>


@@ -27,7 +27,7 @@ QUIT
 ****
 ### protocol v2 receive
 exim -bh HOSTIPV4
 ****
 ### protocol v2 receive
 exim -bh HOSTIPV4

->>> \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
+:eval:\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

 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>
 HELO clientname
 MAIL FROM: <a@test.ex>
 RCPT TO:<b@test.ex>


@@ -38,3 +38,9 @@ body v2
 .
 QUIT
 ****
 .
 QUIT
 ****

+### proxy timeout
+exim -bh HOSTIPV4
+:sleep:3
+PROXY TCP4 127.0.0.2 127.42.42.42 64000 25
+QUIT
+****