tests: improve SLOWDOWN test reliability by reducing sent data

These tests are run in SLOWDOWN mode which adds a 10 msec delay after
each character output, which means it takes at least 1.6 seconds (and
320 kernel calls) just to get through the long welcome banner. On an
overloaded system, this can end up taking much more than 1.6 seconds,
and even more than the 7 or 16 second curl timeout that the tests rely
on, causing them to fail. Reducing the size of the welcome banner drops
the total number of characters sent before the transfer starts by more
than half, which reduces the opportunity for test-breaking slowdowns by
the same amount.

Ref: #11328

diff --git a/tests/data/test1086 b/tests/data/test1086
index 18b464178adbc47333b7df86cc68eaf89b578c04..21bbaeef97639e9c2b3d8fcece53db3fbd50a6cb 100644 (file)
--- a/tests/data/test1086
+++ b/tests/data/test1086
@@ -8,6 +8,7 @@ timeout
 FAILURE
 SLOWDOWN
 flaky
+timing-dependent
 </keywords>
 </info>
 
@@ -17,6 +18,7 @@ flaky
 # to avoid wasting time waiting for the data phase to start
 <servercmd>
 SLOWDOWN
+REPLY welcome 220 Hey
 REPLY USER 331 OK
 REPLY PASS 230 OK
 REPLY PWD 257 "/"

diff --git a/tests/data/test1112 b/tests/data/test1112
index 7eefb61f1386f73bbe51d88d61bf52672df9fec1..eb4d6f02f85c4f744d89807cd766c11748cd86ad 100644 (file)
--- a/tests/data/test1112
+++ b/tests/data/test1112
@@ -16,6 +16,7 @@ SLOWDOWN
 # to avoid wasting time waiting for the data phase to start
 <servercmd>
 SLOWDOWN
+REPLY welcome 220 Hey
 REPLY USER 331 OK
 REPLY PASS 230 OK
 REPLY PWD 257 "/"