tests: tweak lock file handling and timers

- when server are killed by a test case, do not wait for the server lock
  file to go away. These tests are mostly about client timeouts and the
  server will hang until killed.
- when killing a server successfully, check for a remaining lock file,
  log its existence and remove it.
- lower the delay timings on SLOWDOWN by half
- add SLOWDOWNDATA server command to only slow down the FTP data bytes,
  not the control ones.
- lower some timeout values

Closes #14835
This commit is contained in:
Stefan Eissing 2024-09-09 13:52:44 +02:00 committed by Daniel Stenberg
parent 8ca6030839
commit e70c22b622
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
10 changed files with 126 additions and 42 deletions

View file

@ -6,7 +6,7 @@ EPSV
RETR
timeout
FAILURE
SLOWDOWN
SLOWDOWNDATA
flaky
timing-dependent
</keywords>
@ -14,10 +14,8 @@ timing-dependent
# Server-side
<reply>
# Overload some standard FTP responses to make them shorter and faster
# to avoid wasting time waiting for the data phase to start
<servercmd>
SLOWDOWN
SLOWDOWNDATA
REPLY welcome 220 Hey
REPLY USER 331 OK
REPLY PASS 230 OK
@ -90,7 +88,7 @@ ftp
FTP download with strict timeout and slow data transfer
</name>
<command>
ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7
ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 5
</command>
</client>

View file

@ -7,17 +7,15 @@ EPSV
RETR
timeout
FAILURE
SLOWDOWN
SLOWDOWNDATA
timing-dependent
</keywords>
</info>
# Server-side
<reply>
# Overload some standard FTP responses to make them shorter and faster
# to avoid wasting time waiting for the data phase to start
<servercmd>
SLOWDOWN
SLOWDOWNDATA
REPLY welcome 220 Hey
REPLY USER 331 OK
REPLY PASS 230 OK
@ -93,7 +91,7 @@ ftps
FTPS download with strict timeout and slow data transfer
</name>
<command>
-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 16
-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 5
</command>
</client>

View file

@ -26,6 +26,9 @@ wait 10
<server>
http
</server>
<killserver>
http
</killserver>
<name>
HTTP with 2 secs timeout
</name>