tests: unify test case keywords

Unify the case, punctuation and name of test case keywords so they can be more easily selected or skipped when desired. Add a few keywords that were missing. Fix a couple of typos in test names.
2025-09-09 13:49:44 +03:00 · 2025-04-04 11:35:33 -07:00 · 2025-04-04 11:35:33 -07:00 · cbb80f215e
commit cbb80f215e
parent 80f9f6e59b
55 changed files with 63 additions and 43 deletions
--- a/tests/data/test1101
+++ b/tests/data/test1101
@ -4,6 +4,8 @@
 HTTP
 HTTP GET
 HTTP Basic auth
+HTTP proxy
+http_proxy
 NO_PROXY
 </keywords>
 </info>
--- a/tests/data/test1194
+++ b/tests/data/test1194
@ -30,7 +30,7 @@ mqtt
 mqtt
 </server>
 <name>
-MQTT SUBSCRIBE with PUBLISH befoire SUBACK
+MQTT SUBSCRIBE with PUBLISH before SUBACK
 </name>
 <command option="binary-trace">
 mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
--- a/tests/data/test1252
+++ b/tests/data/test1252
@ -30,7 +30,7 @@ proxy
 http
 </server>
 <name>
-Under condition using --proxy, override NO_PROXY by --nproxy and access target URL directly
+Under condition using --proxy, override NO_PROXY by --noproxy and access target URL directly
 </name>
 <setenv>
 NO_PROXY=example.com
--- a/tests/data/test1253
+++ b/tests/data/test1253
@ -27,7 +27,7 @@ foo
 http
 </server>
 <name>
-Under condition using --proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using --proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 NO_PROXY=example.com
--- a/tests/data/test1255
+++ b/tests/data/test1255
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL directly
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL directly
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
--- a/tests/data/test1256
+++ b/tests/data/test1256
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
--- a/tests/data/test1257
+++ b/tests/data/test1257
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
--- a/tests/data/test1265
+++ b/tests/data/test1265
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
--- a/tests/data/test1289
+++ b/tests/data/test1289
@ -18,7 +18,7 @@ globbing
 http
 </server>
 <name>
-globbing with overflow and bad syntxx
+globbing with overflow and bad syntax
 </name>
 <command>
 http://ur%20[0-60000000000000000000
--- a/tests/data/test1322
+++ b/tests/data/test1322
@ -4,7 +4,7 @@
 HTTP
 HTTP GET
 --resolve
-trailing dot
+trailing-dot
 </keywords>
 </info>

--- a/tests/data/test1550
+++ b/tests/data/test1550
@ -20,7 +20,7 @@ lib%TESTNUMBER
 </tool>

 <name>
-verify setting pipeling blocklisting options
+verify setting pipelining blocklisting options
 </name>
 <command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
--- a/tests/data/test1560
+++ b/tests/data/test1560
@ -2,7 +2,7 @@
 <info>
 <keywords>
 unittest
-URLAPI
+urlapi
 </keywords>
 </info>

--- a/tests/data/test1630
+++ b/tests/data/test1630
@ -3,8 +3,8 @@
 <keywords>
 HTTP
 HTTP GET
-HTTPS-proxy
-HTTPS-proxy Basic auth
+HTTPS proxy
+HTTPS proxy Basic auth
 </keywords>
 </info>

--- a/tests/data/test1631
+++ b/tests/data/test1631
@ -2,7 +2,7 @@
 <info>
 <keywords>
 FTP
-HTTPS-proxy
+HTTPS proxy
 flaky
 </keywords>
 </info>
--- a/tests/data/test1632
+++ b/tests/data/test1632
@ -2,7 +2,7 @@
 <info>
 <keywords>
 FTP
-HTTPS-proxy
+HTTPS proxy
 flaky
 </keywords>
 </info>
--- a/tests/data/test1650
+++ b/tests/data/test1650
@ -17,7 +17,7 @@ unittest
 DoH
 </features>
 <name>
-DOH
+DoH parsing
 </name>
 </client>
 </testcase>
--- a/tests/data/test1654
+++ b/tests/data/test1654
@ -2,8 +2,7 @@
 <info>
 <keywords>
 unittest
-alt-svc
-altsvc
+Alt-Svc
 </keywords>
 </info>

--- a/tests/data/test1655
+++ b/tests/data/test1655
@ -2,7 +2,7 @@
 <info>
 <keywords>
 unittest
-doh
+DOH
 </keywords>
 </info>

--- a/tests/data/test1709
+++ b/tests/data/test1709
@ -16,7 +16,7 @@ none
 </server>

 <name>
-Verify curl -h --badone
+Verify curl -h with bad option name
 </name>

 <command>
--- a/tests/data/test1919
+++ b/tests/data/test1919
@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-conn-reuse
+connection reuse
 </keywords>
 </info>

--- a/tests/data/test219
+++ b/tests/data/test219
@ -2,6 +2,7 @@
 <info>
 <keywords>
 proxy
+unsupported scheme
 </keywords>
 </info>

--- a/tests/data/test23
+++ b/tests/data/test23
@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-unsupported protocol
+unsupported scheme
 FAILURE
 </keywords>
 </info>
--- a/tests/data/test235
+++ b/tests/data/test235
@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>

--- a/tests/data/test247
+++ b/tests/data/test247
@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+MDTM
 </keywords>
 </info>

--- a/tests/data/test248
+++ b/tests/data/test248
@ -2,6 +2,8 @@
 <info>
 <keywords>
 FTP
+STOR
+MDTM
 </keywords>
 </info>

--- a/tests/data/test260
+++ b/tests/data/test260
@ -32,7 +32,7 @@ Funny-head: yesyes
 http
 </server>
 <name>
-HTTP GET URL without slash but with questionmark
+HTTP GET URL without slash but with question mark
 </name>
 <command>
 "http://%HOSTIP:%HTTPPORT?%TESTNUMBER"
--- a/tests/data/test3021
+++ b/tests/data/test3021
@ -2,7 +2,8 @@
 <info>
 <keywords>
 SFTP
-server sha256 key check
+server key check
+SHA256
 </keywords>
 </info>

--- a/tests/data/test3022
+++ b/tests/data/test3022
@ -2,7 +2,8 @@
 <info>
 <keywords>
 SCP
-server sha256 key check
+server key check
+SHA256
 </keywords>
 </info>

--- a/tests/data/test3104
+++ b/tests/data/test3104
@ -38,7 +38,7 @@ http
 lib%TESTNUMBER
 </tool>
 <name>
-CURLOPT_COOKIELIST with netscape format
+CURLOPT_COOKIELIST with Netscape format
 </name>
 <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
--- a/tests/data/test333
+++ b/tests/data/test333
@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-command-line
+cmdline
 </keywords>
 </info>

--- a/tests/data/test357
+++ b/tests/data/test357
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP PUT
-Expect
+Expect: 100-continue
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test365
+++ b/tests/data/test365
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Chunked
+chunked Transfer-Encoding
 </keywords>
 </info>

--- a/tests/data/test367
+++ b/tests/data/test367
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>

--- a/tests/data/test373
+++ b/tests/data/test373
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-chunked transfer encoding
+chunked Transfer-Encoding
 </keywords>
 </info>

--- a/tests/data/test417
+++ b/tests/data/test417
@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTPS
+--write-out
 %{certs}
 </keywords>
 </info>
@ -31,7 +32,7 @@ http
 https
 </server>
 <name>
-%{certs}
+--write-out with %{certs}
 </name>
 <command option="no-include">
 --insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -w '%{certs}'
--- a/tests/data/test419
+++ b/tests/data/test419
@ -2,7 +2,7 @@
 <info>
 <keywords>
 --dump-header
-failure
+FAILURE
 </keywords>
 </info>

--- a/tests/data/test426
+++ b/tests/data/test426
@ -1,6 +1,7 @@
 <testcase>
 <info>
 <keywords>
+Resume
 error detection
 </keywords>
 </info>
--- a/tests/data/test469
+++ b/tests/data/test469
@ -2,7 +2,6 @@
 <info>
 <keywords>
 HTTP
-
 </keywords>
 </info>

--- a/tests/data/test470
+++ b/tests/data/test470
@ -2,7 +2,6 @@
 <info>
 <keywords>
 HTTP
-
 </keywords>
 </info>

--- a/tests/data/test480
+++ b/tests/data/test480
@ -2,7 +2,7 @@
 <info>
 <keywords>
 netrc
-pop3
+POP3
 </keywords>
 </info>
 #
--- a/tests/data/test484
+++ b/tests/data/test484
@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-etags
+etag
 </keywords>
 </info>

--- a/tests/data/test485
+++ b/tests/data/test485
@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-etags
+etag
 </keywords>
 </info>

--- a/tests/data/test505
+++ b/tests/data/test505
@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>

--- a/tests/data/test541
+++ b/tests/data/test541
@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>

--- a/tests/data/test63
+++ b/tests/data/test63
@ -5,6 +5,7 @@ HTTP
 HTTP GET
 HTTP proxy
 HTTP proxy Basic auth
+http_proxy
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test647
+++ b/tests/data/test647
@ -3,6 +3,7 @@
 <keywords>
 IMAP
 APPEND
+UPLOAD
 MULTIPART
 </keywords>
 </info>
--- a/tests/data/test693
+++ b/tests/data/test693
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-etags
+etag
 </keywords>
 </info>
 #
--- a/tests/data/test709
+++ b/tests/data/test709
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 SOCKS5
+http_proxy
 </keywords>
 </info>

--- a/tests/data/test783
+++ b/tests/data/test783
@ -52,7 +52,7 @@ CURL_TIME=1728465947
 </file>

 <name>
-HSTS update expiry, removing includesubdomains in update
+HSTS update expiry, removing includeSubDomains in update
 </name>
 <command>
 -x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
--- a/tests/data/test898
+++ b/tests/data/test898
@ -5,7 +5,7 @@ HTTP
 HTTP proxy
 --location
 Authorization
-Cookie
+cookies
 </keywords>
 </info>

--- a/tests/data/test899
+++ b/tests/data/test899
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>

--- a/tests/data/test954
+++ b/tests/data/test954
@ -5,7 +5,7 @@ SMTP
 SASL
 SASL AUTH PLAIN
 RFC4616
-RFC4%TESTNUMBER
+RFC4954
 </keywords>
 </info>

--- a/tests/data/test979
+++ b/tests/data/test979
@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>

--- a/tests/data/test987
+++ b/tests/data/test987
@ -2,6 +2,7 @@
 <info>
 <keywords>
 SMTPS
+UPLOAD
 </keywords>
 </info>

--- a/tests/data/test992
+++ b/tests/data/test992
@ -1,7 +1,9 @@
 <testcase>
 <info>
 <keywords>
+SMTP
 SASL
+UPLOAD
 </keywords>
 </info>