tidy-up: miscellaneous

- drop more uses of the word "just". (not enforced here)
- drop some uses of the "will" word.
- "then" -> "than".
- tests/http/testenv/curl.py: fix copy-paste typo in error message.
- pytest: replace `shutdownh` with `shutdown` in test names.
  Spotted by GitHub Code Quality.
- comment typos.
- whitespace and newlines fixes.

Closes #21830
This commit is contained in:
Viktor Szakats 2026-05-28 23:50:52 +02:00
parent 032b15c434
commit d229055549
No known key found for this signature in database
116 changed files with 184 additions and 185 deletions

View file

@ -23,7 +23,7 @@
###########################################################################
#
# This file can be used to specify test cases that should not run when all
# test cases are run by runtests.pl. Just add the plain test case numbers, one
# test cases are run by runtests.pl. Add the plain test case numbers, one
# per line.
# Lines starting with '#' letters are treated as comments.
#
@ -43,7 +43,7 @@
1184
1209
1211
# fnmatch differences are just too common to make testing them sensible
# fnmatch differences are too common to make testing them sensible
1307
1316
1512

View file

@ -13,7 +13,7 @@ HTTP Basic auth
<reply>
# The test server provides no way to respond differently to a subsequent
# Basic authenticated request (we really want to respond with 200 for
# the second), so just respond with 401 for both and let curl deal with it.
# the second), so respond with 401 for both and let curl deal with it.
<data crlf="headers">
HTTP/1.1 401 Authorization Required
Server: testcurl

View file

@ -11,7 +11,7 @@ HTTP/0.9
# Server-side
<reply>
<data>
No headers at all, just data swsclose
No headers at all, only data swsclose
Let's get

View file

@ -9,7 +9,7 @@ FAILURE
# Server-side
<reply>
<servercmd>
REPLY PWD 257 "just one
REPLY PWD 257 "Only one
</servercmd>
</reply>

View file

@ -51,7 +51,7 @@ Accept: */*
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# CURLOPT_INTERLEAVEDATA requires RTSP protocol
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -62,7 +62,7 @@ X-Men: cyclops, iceman
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -54,7 +54,7 @@ foo=bar%AMPbaz=quux
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -51,7 +51,7 @@ Accept: */*
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -96,7 +96,7 @@ dummy data
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -65,11 +65,11 @@ QUIT
<stripfile>
# CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
# support, IOW depends on configuration - just ignore these.
# support, IOW depends on configuration - ignore these.
$_ = '' if /CURLOPT_USERAGENT/
$_ = '' if /CURLOPT_MAXREDIRS/
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -61,7 +61,7 @@ body
.
</upload>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_MAXREDIRS/
$_ = '' if /CURLOPT_SSL_VERIFYPEER/

View file

@ -48,7 +48,7 @@ LIST %TESTNUMBER
QUIT
</protocol>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_USERAGENT/

View file

@ -54,7 +54,7 @@ A004 FETCH 1 BODY[]
A005 LOGOUT
</protocol>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_MAXREDIRS/
$_ = '' if /CURLOPT_SSL_VERIFYPEER/

View file

@ -58,7 +58,7 @@ Content-Type: application/x-www-form-urlencoded
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -54,7 +54,7 @@ Proxy-Connection: Keep-Alive
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# CURLOPT_INTERLEAVEDATA requires RTSP protocol
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

View file

@ -16,7 +16,7 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2
Content-Type: text/html; charset=iso-8859-1
Connection: close
GET received and served just fine. Thank you very much
GET received and served fine. Thank you very much
</data>
</reply>

View file

@ -16,7 +16,7 @@ Explanation for the duplicate 400 requests:
libcurl does not detect that a given Digest password is wrong already on the
first 401 response (as the data400 gives). libcurl will instead consider the
new response just as a duplicate and it sends another and detects the auth
new response as a duplicate and it sends another and detects the auth
problem on the second 401 response!
-->

View file

@ -21,7 +21,7 @@ Explanation for the duplicate 400 requests:
libcurl does not detect that a given Digest password is wrong already on the
first 401 response (as the data400 gives). libcurl will instead consider the
new response just as a duplicate and it sends another and detects the auth
new response as a duplicate and it sends another and detects the auth
problem on the second 401 response!
-->

View file

@ -31,7 +31,7 @@ HTTP PUT from a file but enforce chunked transfer-encoding
-T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command>
<file name="%LOGDIR/file%TESTNUMBER">
just some tiny teeny contents
some tiny teeny test contents
</file>
</client>
@ -45,7 +45,7 @@ Accept: */*%CR
Transfer-Encoding: chunked%CR
%CR
1e%CR
just some tiny teeny contents
some tiny teeny test contents
%CR
0%CR
%CR

View file

@ -62,7 +62,7 @@ Connection: Upgrade
</protocol>
# This test used to check that "connection closed" was output, but
# that is flaky since the outgoing PING just before might fail already
# that is flaky since the outgoing PING before might fail already
# and then the test exists before the output gets to be written
</verify>
</testcase>

View file

@ -10,7 +10,7 @@ HTTP GET
# Server-side
<reply>
<data>
No headers at all, just data swsclose
No headers at all, data swsclose
Let's get

View file

@ -35,7 +35,7 @@ chunky-trailer: header data
http
</server>
<name>
A non existing file with --etag-compare is just a blank
A non existing file with --etag-compare is a blank
</name>
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER

View file

@ -25,7 +25,7 @@ lib%TESTNUMBER
SFTP with multi interface, remove handle early
</name>
# The command here uses 'localhost' just to make sure that curl_multi_perform
# The command here uses 'localhost' to make sure that curl_multi_perform
# does not reach too far in the first invoke. When using c-ares at least, the
# name resolve causes it to return rather quickly and thus we could trigger
# the problem we are looking to verify.

View file

@ -32,7 +32,7 @@ http
proxy
</features>
<name>
HTTP CONNECT with proxy returning just HTML and closing
HTTP CONNECT with proxy returning HTML and closing
</name>
<command>
http://test.example --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -sS

View file

@ -24,7 +24,7 @@ smtp
SMTP VRFY with custom request
</name>
# the custom request just does it lowercase to remain the same command
# the custom request does it lowercase to remain the same command
<command>
smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
</command>