Testsuite: revert some of the modernish Perl constructs

[exim.git] / test / scripts / 0000-Basic / 0461

diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461
index a9fd584dfb0605205aa433f51f23d3c3c53fc136..04c1911ed0d1f67dc14a0345fde3b0930f0515e0 100644 (file)
--- a/test/scripts/0000-Basic/0461
+++ b/test/scripts/0000-Basic/0461
@@ -19,7 +19,7 @@ QUIT
 exim -odi userx@test.ex
 Short message
 ****
 exim -odi userx@test.ex
 Short message
 ****

-sleep 3
+sleep 2

 server PORT_S
 220 server ready
 EHLO
 server PORT_S
 220 server ready
 EHLO


@@ -38,6 +38,7 @@ QUIT
 exim -odi userx@test.ex
 Short message
 ****
 exim -odi userx@test.ex
 Short message
 ****

+sleep 1

 server PORT_S
 220 server ready
 EHLO
 server PORT_S
 220 server ready
 EHLO


@@ -53,7 +54,7 @@ DATA
 QUIT
 221 OK
 ****
 QUIT
 221 OK
 ****

-exim -odi userx@test.ex
+exim -DRETRY1=5s -odi userx@test.ex

 Short message
 ****
 exim -DFALLBACK= -odi userx@test.ex
 Short message
 ****
 exim -DFALLBACK= -odi userx@test.ex


@@ -63,7 +64,7 @@ exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message
 ****
 sleep 3
 Short message
 ****
 sleep 3

-exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -q
+exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -DRETRY2=5s -q

 ****
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message
 ****
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message