diff --git a/tests/data/test1062 b/tests/data/test1062 index b95818d2bf..f8a0ae1460 100644 --- a/tests/data/test1062 +++ b/tests/data/test1062 @@ -26,7 +26,7 @@ REPLY CWD %repeat[218 x 250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ftp -FTP with excessively long server command response lines, boundary condition +FTP excessively long server command response lines, boundary condition ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test1088 b/tests/data/test1088 index 36d8e2496f..04484add38 100644 --- a/tests/data/test1088 +++ b/tests/data/test1088 @@ -75,7 +75,7 @@ contents http -HTTP, proxy with --anyauth and Location: to new host using location-trusted +HTTP, proxy with --anyauth and Location: using location-trusted http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth diff --git a/tests/data/test1113 b/tests/data/test1113 index 7486952f6e..ed606ec667 100644 --- a/tests/data/test1113 +++ b/tests/data/test1113 @@ -26,7 +26,7 @@ ftp lib574 -FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response) +FTP wildcard download - changed fnmatch, 2x perform (DOS LIST) "ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt" diff --git a/tests/data/test1133 b/tests/data/test1133 index bb25c01666..109d6be5c9 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -27,7 +27,7 @@ Mime http -HTTP RFC1867-type formposting with filename/data contains ',', ';', '"' +HTTP formpost with filename/data containing ',', ';', '"' http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER diff --git a/tests/data/test1177 b/tests/data/test1177 index ae340e8bf5..19697e6b14 100644 --- a/tests/data/test1177 +++ b/tests/data/test1177 @@ -11,7 +11,7 @@ documentation # Client-side -Verify that feature names and CURL_VERSION_* in lib and docs are in sync +Verify feature names and CURL_VERSION_* in lib and docs in sync diff --git a/tests/data/test1253 b/tests/data/test1253 index 621ecf9401..92eff37774 100644 --- a/tests/data/test1253 +++ b/tests/data/test1253 @@ -28,7 +28,7 @@ foo http ---proxy, override NO_PROXY by --noproxy and access target URL through proxy +--proxy, override NO_PROXY by --noproxy and access URL through proxy NO_PROXY=example.com diff --git a/tests/data/test1255 b/tests/data/test1255 index 57780f110d..fac1802182 100644 --- a/tests/data/test1255 +++ b/tests/data/test1255 @@ -29,7 +29,7 @@ foo http -http_proxy, override NO_PROXY by --noproxy and access target URL directly +http_proxy, override NO_PROXY by --noproxy and access URL directly http_proxy=http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1315 b/tests/data/test1315 index 49788684e9..698e26bf53 100644 --- a/tests/data/test1315 +++ b/tests/data/test1315 @@ -30,7 +30,7 @@ Mime http -HTTP RFC1867-type formposting - -F with three files, one with explicit type +HTTP -F with three files, one with explicit type http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content,%LOGDIR/test%TESTNUMBER.txt' diff --git a/tests/data/test1479 b/tests/data/test1479 index 95dc3d11bc..ccb6ced820 100644 --- a/tests/data/test1479 +++ b/tests/data/test1479 @@ -30,7 +30,7 @@ Data http -HTTP/1.1 response followed by an HTTP/0.9 response over the same connection +HTTP/1.1 response followed by HTTP/0.9 response over same connection http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test1557 b/tests/data/test1557 index a96647690c..9b4ed73fa7 100644 --- a/tests/data/test1557 +++ b/tests/data/test1557 @@ -16,7 +16,7 @@ lib%TESTNUMBER -Remove easy handle in pending connections does not leave dangling entry +Remove easy handle in pending connections, no dangling entry hostname.invalid diff --git a/tests/data/test1616 b/tests/data/test1616 index dc4ebc13f9..c0719b091f 100644 --- a/tests/data/test1616 +++ b/tests/data/test1616 @@ -13,7 +13,7 @@ uint_hash unittest -Internal uint_hash create/add/destroy testing, exercising clean functions +uint_hash create/add/destroy testing, exercising clean functions diff --git a/tests/data/test162 b/tests/data/test162 index d03df40bb4..e650b7cf4f 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -35,7 +35,7 @@ proxy http -HTTP GET asking for --proxy-ntlm when some other authentication is required +HTTP GET --proxy-ntlm when some other authentication is required http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail diff --git a/tests/data/test1641 b/tests/data/test1641 index a71a59b056..46c4f23813 100644 --- a/tests/data/test1641 +++ b/tests/data/test1641 @@ -33,7 +33,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange http -HTTP GET with -J, a redirect and Content-Disposition in the second response +HTTP GET -J, a redirect and Content-Disposition in the second response http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -L -O --output-dir %LOGDIR diff --git a/tests/data/test1642 b/tests/data/test1642 index 81f0ae8fc6..2745b8bb20 100644 --- a/tests/data/test1642 +++ b/tests/data/test1642 @@ -32,7 +32,7 @@ Content-Type: text/html http -HTTP GET with -J, redirect, no Content-Disposition use the Location: name +HTTP GET -J, redirect, no Content-Disposition use the Location: name http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -L -O --output-dir %LOGDIR diff --git a/tests/data/test1677 b/tests/data/test1677 index dbf5ca17a7..e06dc7679c 100644 --- a/tests/data/test1677 +++ b/tests/data/test1677 @@ -45,7 +45,7 @@ random data in first chunk http -HTTP POST response with both Transfer-Encoding chunked and Content-Length 0 +HTTP POST response with both chunked and zero Content-Length http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d "testdata" diff --git a/tests/data/test2010 b/tests/data/test2010 index 443ae9d2f9..19a1892020 100644 --- a/tests/data/test2010 +++ b/tests/data/test2010 @@ -35,7 +35,7 @@ http https -proxy credentials via options for two proxies, redirect from http to https +proxy creds via options for two proxies, redir from http to https diff --git a/tests/data/test2039 b/tests/data/test2039 index bd9558a4bd..6ef3b9d983 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -31,7 +31,7 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp -FTP (optional .netrc with 'default' override; no user/pass) dir list PASV +FTP optional .netrc with 'default' override; no user/pass, dir list --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test2052 b/tests/data/test2052 index 85d3d0988d..bd9a5eb9ad 100644 --- a/tests/data/test2052 +++ b/tests/data/test2052 @@ -27,7 +27,7 @@ OK http ---connect-to: do not mix connections with and without a "connect to host" +--connect-to: do not mix connections with and w/o a "connect to host" diff --git a/tests/data/test2054 b/tests/data/test2054 index 83f203586d..245db971cf 100644 --- a/tests/data/test2054 +++ b/tests/data/test2054 @@ -26,7 +26,7 @@ OK http -Connect to specific host: use the first "connect-to" string that matches +Connect to specific host: use the first "connect-to" string diff --git a/tests/data/test2055 b/tests/data/test2055 index 6a7a8d34ac..aad42d6302 100644 --- a/tests/data/test2055 +++ b/tests/data/test2055 @@ -48,7 +48,7 @@ http-proxy socks5 ---connect-to via SOCKS proxy and HTTP proxy (tunnel mode automatically) +--connect-to via SOCKS proxy and HTTP proxy (tunnel mode auto) proxy diff --git a/tests/data/test2059 b/tests/data/test2059 index 4726c0a1e6..71dc55f059 100644 --- a/tests/data/test2059 +++ b/tests/data/test2059 @@ -70,7 +70,7 @@ proxy digest -HTTP Digest with PUT, resumed upload, modified method, SHA-256 and userhash +HTTP Digest PUT, resumed upload, modified method, SHA-256 and userhash http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test2067 b/tests/data/test2067 index b6de16d0bd..4b6030252c 100644 --- a/tests/data/test2067 +++ b/tests/data/test2067 @@ -55,7 +55,7 @@ crypto digest -HTTP POST --digest with SHA256 and user-specified Content-Length header +HTTP POST --digest with SHA256 and user-specified Content-Length # This test is to ensure 'Content-Length: 0' is sent while negotiating auth # even when there is a user-specified Content-Length header. diff --git a/tests/data/test2072 b/tests/data/test2072 index c7731a83e3..efad82012a 100644 --- a/tests/data/test2072 +++ b/tests/data/test2072 @@ -22,7 +22,7 @@ moo file -file:// with Unix path resolution behavior for the case of extra slashes +file:// with Unix path for the case of extra slashes file:////%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2087 b/tests/data/test2087 index c3a5901d17..cfa5136840 100644 --- a/tests/data/test2087 +++ b/tests/data/test2087 @@ -32,7 +32,7 @@ local-http https test-localhost.pem -simple HTTPS GET with base64-sha256 public key pinning (Schannel variant) +simple HTTPS GET with base64-sha256 public key pinning (Schannel) # This test is pointless if we are not using the Schannel backend diff --git a/tests/data/test2113 b/tests/data/test2113 index 884c0af0a7..1033c3d2b4 100644 --- a/tests/data/test2113 +++ b/tests/data/test2113 @@ -61,7 +61,7 @@ contents http -HTTP custom Authorization: with whitespace before colon and redirect to new host +Authorization: with whitespace before colon and redir to new host http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization : s3cr3t" --proxy-user testing:this --location diff --git a/tests/data/test2311 b/tests/data/test2311 index 91032b81d2..1d43a32929 100644 --- a/tests/data/test2311 +++ b/tests/data/test2311 @@ -26,7 +26,7 @@ This server says moo http -Cookie from file: control octet rejected, prefixes matched case sensitively +Cookie from file: control octet rejected, prefixes case sensitive http://example.fake/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test234 b/tests/data/test234 index 0672a25bde..aa13dccc7a 100644 --- a/tests/data/test234 +++ b/tests/data/test234 @@ -63,7 +63,7 @@ contents http -HTTP, proxy, site+proxy auth and Location: to new host location-trusted +HTTP, proxy, site+proxy auth and Location: --location-trusted http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted diff --git a/tests/data/test258 b/tests/data/test258 index 25a2a8f596..7471c7072e 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -64,7 +64,7 @@ proxy digest -HTTP POST multipart without Expect: header using proxy anyauth (Digest) +HTTP multipart POST without Expect: using proxy anyauth (Digest) -x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth diff --git a/tests/data/test3002 b/tests/data/test3002 index 8c0f063ece..7aa195444a 100644 --- a/tests/data/test3002 +++ b/tests/data/test3002 @@ -16,7 +16,7 @@ SMTP smtp -SMTP multiple and invalid (first) --mail-rcpt and --mail-rcpt-allowfails +SMTP invalid (first) --mail-rcpt and --mail-rcpt-allowfails From: different diff --git a/tests/data/test3003 b/tests/data/test3003 index cbeb243163..66e7627290 100644 --- a/tests/data/test3003 +++ b/tests/data/test3003 @@ -16,7 +16,7 @@ SMTP smtp -SMTP multiple and invalid (last) --mail-rcpt and --mail-rcpt-allowfails +SMTP invalid (last) --mail-rcpt and --mail-rcpt-allowfails From: different diff --git a/tests/data/test3004 b/tests/data/test3004 index 732c478352..ac348339ad 100644 --- a/tests/data/test3004 +++ b/tests/data/test3004 @@ -16,7 +16,7 @@ SMTP smtp -SMTP multiple and invalid (middle) --mail-rcpt and --mail-rcpt-allowfails +SMTP invalid (middle) --mail-rcpt and --mail-rcpt-allowfails From: different diff --git a/tests/data/test3005 b/tests/data/test3005 index 6799b3136d..7bdb503e3f 100644 --- a/tests/data/test3005 +++ b/tests/data/test3005 @@ -16,7 +16,7 @@ SMTP smtp -SMTP multiple invalid (all but one) --mail-rcpt and --mail-rcpt-allowfails +SMTP invalid (all but one) --mail-rcpt and --mail-rcpt-allowfails From: different diff --git a/tests/data/test3006 b/tests/data/test3006 index c1583f6397..518f328e29 100644 --- a/tests/data/test3006 +++ b/tests/data/test3006 @@ -16,7 +16,7 @@ SMTP smtp -SMTP with multiple invalid (all) --mail-rcpt and --mail-rcpt-allowfails +SMTP invalid (all) --mail-rcpt and --mail-rcpt-allowfails From: different diff --git a/tests/data/test3023 b/tests/data/test3023 index e6ffc6a005..7aed3bd4f9 100644 --- a/tests/data/test3023 +++ b/tests/data/test3023 @@ -31,7 +31,7 @@ local-http https test-localhost-san-first.pem -HTTPS localhost, first subaltname matches, CN does not match (Schannel) +HTTPS localhost, first SAN matches, CN does not match (Schannel) # This test is pointless if we are not using the Schannel backend diff --git a/tests/data/test316 b/tests/data/test316 index 0780acce1a..1adf999604 100644 --- a/tests/data/test316 +++ b/tests/data/test316 @@ -46,7 +46,7 @@ brotli http -HTTP GET brotli compressed content of size more than CURL_MAX_WRITE_SIZE +HTTP brotli compressed content of size more than CURL_MAX_WRITE_SIZE http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test3302 b/tests/data/test3302 index 35ccfc79af..6dc504f6cf 100644 --- a/tests/data/test3302 +++ b/tests/data/test3302 @@ -13,7 +13,7 @@ CURLOPT_GSSAPI_DELEGATION unittest -CURLOPT_GSSAPI_DELEGATION stores flags in data->set on GSS-API and SSPI builds +CURLOPT_GSSAPI_DELEGATION stores flags in data->set diff --git a/tests/data/test3303 b/tests/data/test3303 index 697049f013..0bd9e8a7f0 100644 --- a/tests/data/test3303 +++ b/tests/data/test3303 @@ -14,7 +14,7 @@ mTLS unittest -conn-reuse match distinguishes mTLS key, cert_type, key_type and key_passwd fields +conn-reuse distinguishes mTLS key, cert_type, key_type and key_passwd diff --git a/tests/data/test3304 b/tests/data/test3304 index 4380c0819f..738fd5664f 100644 --- a/tests/data/test3304 +++ b/tests/data/test3304 @@ -14,7 +14,7 @@ mTLS unittest -TLS session cache peer key discriminates on mTLS key, key_type and cert_type fields +TLS session cache peer key uses mTLS key, key_type and cert_type diff --git a/tests/data/test345 b/tests/data/test345 index d87cf0696c..2836773889 100644 --- a/tests/data/test345 +++ b/tests/data/test345 @@ -30,7 +30,7 @@ Funny-head: yesyes http -Both --etag-compare and -save store new Etag using one pre-existing file +Both --etag-compare and -save store new Etag in pre-existing file "21025-dc7-39462498" diff --git a/tests/data/test467 b/tests/data/test467 index 799e1609f6..ba46739203 100644 --- a/tests/data/test467 +++ b/tests/data/test467 @@ -9,7 +9,7 @@ cmdline # Client-side -use a bad short option letter that does not exist (after one does exist) +non-existing short option letter (after one that exists) # the second option is outside the normal accepted range diff --git a/tests/data/test485 b/tests/data/test485 index f530d8389e..8f934a83be 100644 --- a/tests/data/test485 +++ b/tests/data/test485 @@ -14,7 +14,7 @@ etag # Client-side -Use --etag-compare and -save with more than one URL, URLs specified first +--etag-compare and -save with more than one URL, URLs specified first http://example.com/%TESTNUMBER http://example.net/fooo --etag-save %LOGDIR/etag%TESTNUMBER diff --git a/tests/data/test5000 b/tests/data/test5000 index b935ecdf8a..3f2a982802 100644 --- a/tests/data/test5000 +++ b/tests/data/test5000 @@ -32,7 +32,7 @@ httpsig -HTTP RFC 9421 Message Signatures: basic GET with Ed25519 +httpsig: basic GET with Ed25519 lib%TESTNUMBER diff --git a/tests/data/test5001 b/tests/data/test5001 index 7465aab2b7..72ae3e07cf 100644 --- a/tests/data/test5001 +++ b/tests/data/test5001 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: CLI GET with query +httpsig: CLI GET with query "http://example.com:8000/%TESTNUMBER/resource?action=read" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key-1" --connect-to example.com:8000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5002 b/tests/data/test5002 index 143d06d122..e09762243b 100644 --- a/tests/data/test5002 +++ b/tests/data/test5002 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: CLI GET with HMAC-SHA256 +httpsig: CLI GET with HMAC-SHA256 "http://example.com:7000/%TESTNUMBER/resource" --httpsig-algo "hmac-sha256" --httpsig-key @%SRCDIR/data/data-httpsig-hmac-sha256.key --httpsig-keyid "shared-key-1" --connect-to example.com:7000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5003 b/tests/data/test5003 index 6468aa60e3..3520feab40 100644 --- a/tests/data/test5003 +++ b/tests/data/test5003 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: custom --httpsig-headers +httpsig: custom --httpsig-headers "http://example.com:6000/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --httpsig-headers "method authority" --connect-to example.com:6000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5004 b/tests/data/test5004 index c916131762..33822b6b6d 100644 --- a/tests/data/test5004 +++ b/tests/data/test5004 @@ -33,7 +33,7 @@ httpsig -HTTP RFC 9421 B.2.6: Ed25519 POST with headers (RFC test vector) +httpsig: Ed25519 POST with headers (RFC test vector) lib%TESTNUMBER diff --git a/tests/data/test5005 b/tests/data/test5005 index e090c943de..210eac29db 100644 --- a/tests/data/test5005 +++ b/tests/data/test5005 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: sign with a regular HTTP header +httpsig: sign with a regular HTTP header "http://example.com:5000/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --httpsig-headers "method authority content-type:" -H "Content-Type: application/json" --connect-to example.com:5000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5006 b/tests/data/test5006 index 046f499648..602404e2a4 100644 --- a/tests/data/test5006 +++ b/tests/data/test5006 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: component name lowercasing +httpsig: component name lowercasing "http://example.com:5100/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --httpsig-headers "method Content-Type:" -H "Content-Type: text/plain" --connect-to example.com:5100:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5007 b/tests/data/test5007 index 1184ebcffb..2ea42a9ffc 100644 --- a/tests/data/test5007 +++ b/tests/data/test5007 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: POST method +httpsig: POST method "http://example.com:5200/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" -d "postbody" --connect-to example.com:5200:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5008 b/tests/data/test5008 index 01e6283224..bbb7e1370e 100644 --- a/tests/data/test5008 +++ b/tests/data/test5008 @@ -30,7 +30,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: error - missing --httpsig-key +httpsig: error - missing --httpsig-key "http://example.com/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-keyid "my-key" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5009 b/tests/data/test5009 index ef7bc5e6a7..2b5771c004 100644 --- a/tests/data/test5009 +++ b/tests/data/test5009 @@ -30,7 +30,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: error - unsupported algorithm +httpsig: error - unsupported algorithm "http://example.com/%TESTNUMBER/resource" --httpsig-algo "rsa-pss-sha512" --httpsig-key %SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5010 b/tests/data/test5010 index 51fd8dd888..6d6293e140 100644 --- a/tests/data/test5010 +++ b/tests/data/test5010 @@ -30,7 +30,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: error - non-existent key file +httpsig: error - non-existent key file "http://example.com/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @/nonexistent/key.hex --httpsig-keyid "my-key" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5011 b/tests/data/test5011 index c883bbe249..d0a5004d22 100644 --- a/tests/data/test5011 +++ b/tests/data/test5011 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: query string with special characters +httpsig: query string with special characters "http://example.com:5300/%TESTNUMBER/resource?name=me%AMPnoval%AMPaim=b%25ad" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --connect-to example.com:5300:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5012 b/tests/data/test5012 index 8f183738e5..528e708383 100644 --- a/tests/data/test5012 +++ b/tests/data/test5012 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: default port omitted from @authority +httpsig: default port omitted from @authority "http://example.com/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5013 b/tests/data/test5013 index beb3a1cf70..7e2844e201 100644 --- a/tests/data/test5013 +++ b/tests/data/test5013 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: non-default port in @authority +httpsig: non-default port in @authority "http://example.com:9000/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --connect-to example.com:9000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5014 b/tests/data/test5014 index 51fab716bd..0be72c8927 100644 --- a/tests/data/test5014 +++ b/tests/data/test5014 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: @query explicitly requested, no query in URL +httpsig: @query explicitly requested, no query in URL "http://example.com:5400/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --httpsig-headers "method authority query" --connect-to example.com:5400:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5015 b/tests/data/test5015 index 5f6af68bc0..e8739e0132 100644 --- a/tests/data/test5015 +++ b/tests/data/test5015 @@ -34,7 +34,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: POST with HMAC-SHA256 +httpsig: POST with HMAC-SHA256 "http://example.com:5500/%TESTNUMBER/resource" --httpsig-algo "hmac-sha256" --httpsig-key @%SRCDIR/data/data-httpsig-hmac-sha256.key --httpsig-keyid "shared-key-1" -d "postbody" --connect-to example.com:5500:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5016 b/tests/data/test5016 index 01a12a1ab0..fba1ae0156 100644 --- a/tests/data/test5016 +++ b/tests/data/test5016 @@ -34,7 +34,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: HMAC-SHA256 with custom headers +httpsig: HMAC-SHA256 with custom headers "http://example.com:5600/%TESTNUMBER/resource" --httpsig-algo "hmac-sha256" --httpsig-key @%SRCDIR/data/data-httpsig-hmac-sha256.key --httpsig-keyid "shared-key-1" --httpsig-headers "method authority content-type:" -H "Content-Type: application/json" --connect-to example.com:5600:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5017 b/tests/data/test5017 index 04a582e0d3..f734593cab 100644 --- a/tests/data/test5017 +++ b/tests/data/test5017 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: user-supplied Signature header skips signing +httpsig: user-supplied Signature header skips signing "http://example.com:5700/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key %SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" -H "Signature: preexisting" -H "Signature-Input: preexisting" --connect-to example.com:5700:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5018 b/tests/data/test5018 index ab03747070..365a85fb2b 100644 --- a/tests/data/test5018 +++ b/tests/data/test5018 @@ -36,7 +36,7 @@ httpsig putdata -HTTP RFC 9421 Message Signatures: PUT upload +httpsig: PUT upload "http://example.com:5800/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" -T log/upload5018 --connect-to example.com:5800:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5019 b/tests/data/test5019 index b07df9aa18..d958836d33 100644 --- a/tests/data/test5019 +++ b/tests/data/test5019 @@ -30,7 +30,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: error - duplicate component +httpsig: error - duplicate component "http://example.com/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key %SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key" --httpsig-headers "method method" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5020 b/tests/data/test5020 index f6c27e877d..33b1c2b6e9 100644 --- a/tests/data/test5020 +++ b/tests/data/test5020 @@ -30,7 +30,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: error - rejects legacy '@' component syntax +httpsig: error - rejects legacy '@' component syntax "http://example.com/%TESTNUMBER/resource" --httpsig-algo "ed25519" --httpsig-key %SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key" --httpsig-headers "@method authority" --connect-to example.com::%HOSTIP:%HTTPPORT diff --git a/tests/data/test5021 b/tests/data/test5021 index 9370943853..cc96dfc50b 100644 --- a/tests/data/test5021 +++ b/tests/data/test5021 @@ -32,7 +32,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: default algorithm (ed25519) when --httpsig-algo omitted +httpsig: default algorithm (ed25519) when --httpsig-algo omitted "http://example.com:6100/%TESTNUMBER/resource" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "test-key-ed25519" --connect-to example.com:6100:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5022 b/tests/data/test5022 index a27ab7701f..4069971937 100644 --- a/tests/data/test5022 +++ b/tests/data/test5022 @@ -33,7 +33,7 @@ Debug httpsig -HTTP RFC 9421 Message Signatures: pass key directly +httpsig: pass key directly "http://example.com:8000/5001/resource?action=read" --httpsig-algo "ed25519" --variable key@%SRCDIR/data/data-httpsig-ed25519.key --expand-httpsig-key '{{key:trim}}' --httpsig-keyid "my-key-1" --connect-to example.com:8000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test5023 b/tests/data/test5023 index 1d59c23994..d706ec70c0 100644 --- a/tests/data/test5023 +++ b/tests/data/test5023 @@ -39,7 +39,7 @@ Debug httpsig -HTTP Message Signature with cross-origin redirect +httpsig: cross-origin redirect "http://example.com:8000/%TESTNUMBER/resource?action=read" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key-1" --connect-to example.com:8000:%HOSTIP:%HTTPPORT --connect-to example.org:9000:%HOSTIP:%HTTPPORT --location diff --git a/tests/data/test5024 b/tests/data/test5024 index 930b0de65d..eefbe9564e 100644 --- a/tests/data/test5024 +++ b/tests/data/test5024 @@ -39,7 +39,7 @@ Debug httpsig -HTTP Message Signature with same-origin redirect +httpsig: same-origin redirect "http://example.com:8000/%TESTNUMBER/resource?action=read" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key-1" --connect-to example.com:8000:%HOSTIP:%HTTPPORT --location diff --git a/tests/data/test5025 b/tests/data/test5025 index 10c48073de..0e45de0d81 100644 --- a/tests/data/test5025 +++ b/tests/data/test5025 @@ -39,7 +39,7 @@ Debug httpsig -HTTP Message Signature with cross-origin + user auth redirect +httpsig: cross-origin + user auth redirect "http://example.com:8000/%TESTNUMBER/resource?action=read" --httpsig-algo "ed25519" --httpsig-key @%SRCDIR/data/data-httpsig-ed25519.key --httpsig-keyid "my-key-1" --connect-to example.com:8000:%HOSTIP:%HTTPPORT --connect-to example.org:9000:%HOSTIP:%HTTPPORT --location diff --git a/tests/data/test529 b/tests/data/test529 index 473bf165f3..52495ce63c 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -24,7 +24,7 @@ ftp lib525 -FTP PORT upload using multi interface (weird cleanup function sequence) +FTP PORT upload using multi interface (weird cleanup function seq) ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test546 b/tests/data/test546 index 06bc27501d..97459e9e3b 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -36,7 +36,7 @@ ftp lib533 -FTP RETR a non-existing file then a found one using the multi interface +FTP RETR non-existing file then a found one using multi ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test550 b/tests/data/test550 index c3b7471785..7ef61f89a4 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -37,7 +37,7 @@ proxy lib549 -FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer +FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE using ASCII # first URL then proxy diff --git a/tests/data/test565 b/tests/data/test565 index 432e4177e6..6975239b77 100644 --- a/tests/data/test565 +++ b/tests/data/test565 @@ -68,7 +68,7 @@ lib510 -send HTTP POST using read callback, chunked transfer-encoding and Digest +HTTP POST using read callback, chunked transfer-encoding and Digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test574 b/tests/data/test574 index 6681bfaa25..38dfb7ab80 100644 --- a/tests/data/test574 +++ b/tests/data/test574 @@ -22,7 +22,7 @@ ftp lib%TESTNUMBER -FTP wildcard download - changed fnmatch, 2x perform (Unix LIST response) +FTP wildcard download - changed fnmatch, 2x perform (Unix LIST) ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt diff --git a/tests/data/test73 b/tests/data/test73 index b9864e83f7..4a4ba413f3 100644 --- a/tests/data/test73 +++ b/tests/data/test73 @@ -27,7 +27,7 @@ boo http -HTTP, receive cookies when using custom Host:, domain using only two dots +HTTP cookies when using custom Host:, domain using only two dots http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se" diff --git a/tests/data/test739 b/tests/data/test739 index 06b73f9027..bf7dc42ce4 100644 --- a/tests/data/test739 +++ b/tests/data/test739 @@ -19,7 +19,7 @@ ipfs http -IPNS path and query args for gateway and IPFS URL (malformed gateway URL) +IPNS path and query args for gw and IPFS URL (malformed gw URL) --ipfs-gateway "http://%HOSTIP:%HTTPPORT/some/path?biz=baz" "ipns://fancy.tld/a/b?foo=bar%AMPaaa=bbb" diff --git a/tests/data/test845 b/tests/data/test845 index 97f61b7781..39f2c46e64 100644 --- a/tests/data/test845 +++ b/tests/data/test845 @@ -27,7 +27,7 @@ REPLY AQ== A002 NO Authentication failed imap -IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response +IMAP OAuth failure as continuation with initial response 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test890 b/tests/data/test890 index 0892ba5b47..68d36f0c50 100644 --- a/tests/data/test890 +++ b/tests/data/test890 @@ -28,7 +28,7 @@ REPLY AQ== -ERR Authentication failed pop3 -POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response +POP3 OAuth failure as continuation with initial response pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir diff --git a/tests/data/test91 b/tests/data/test91 index 004b8cb470..07d4e92adf 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -82,7 +82,7 @@ SSL http -HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0 +HTTP NTLM/Negotiate/Basic, anyauth and user with domain, with size 0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret diff --git a/tests/data/test949 b/tests/data/test949 index d2407048c5..95d0492823 100644 --- a/tests/data/test949 +++ b/tests/data/test949 @@ -27,7 +27,7 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s smtp -SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response +SMTP OAuth failure as continuation with initial response mail body diff --git a/tests/data/test956 b/tests/data/test956 index 5ee26997b2..1e31ad163b 100644 --- a/tests/data/test956 +++ b/tests/data/test956 @@ -23,7 +23,7 @@ codeset-utf8 LC_ALL=C.UTF-8 -SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only) +SMTP without SMTPUTF8 support - UTF-8 based recipient (local part) From: different diff --git a/tests/data/test958 b/tests/data/test958 index 9ee2bb681e..ff9ffe35aa 100644 --- a/tests/data/test958 +++ b/tests/data/test958 @@ -24,7 +24,7 @@ codeset-utf8 LC_ALL=C.UTF-8 -SMTP external VRFY without SMTPUTF8 - UTF-8 recipient (local part only) +SMTP external VRFY without SMTPUTF8 - UTF-8 recipient (local part) smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@example.com diff --git a/tests/data/test964 b/tests/data/test964 index 3465d20211..4c001a082e 100644 --- a/tests/data/test964 +++ b/tests/data/test964 @@ -26,7 +26,7 @@ codeset-utf8 LC_ALL=C.UTF-8 -SMTP external VRFY without SMTPUTF8 (IDN) - UTF-8 recipient (host part) +SMTP external VRFY w/o SMTPUTF8 (IDN) - UTF-8 recipient (host part) smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]hex%.se diff --git a/tests/runtests.pl b/tests/runtests.pl index eee5c2950e..4b5b5b0826 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -967,6 +967,11 @@ sub citest_starttest { my $testname = (getpart("client", "name"))[0]; chomp $testname; + if(length($testname) > 70) { + logmsg "ERROR: test $testnum has a too long name, wider than 70 columns\n"; + return 1; + } + # create test result in CI services if(azure_check_environment() && $AZURE_RUN_ID) { $AZURE_RESULT_ID = azure_create_test_result($ACURL, $AZURE_RUN_ID, $testnum, $testname); @@ -974,6 +979,7 @@ sub citest_starttest { elsif(appveyor_check_environment()) { appveyor_create_test_result($ACURL, $testnum, $testname); } + return 0; } # Submit the test case result with the CI runner @@ -1212,7 +1218,7 @@ sub singletest_count { } # At this point we have committed to run this test - logmsg sprintf("test %04d...", $testnum) if(!$automakestyle); + logmsg sprintf("test %04d ", $testnum) if(!$automakestyle); # name of the test my $testname = (getpart("client", "name"))[0]; @@ -2002,7 +2008,9 @@ sub singletest { ################################################################### # Register the test case with the CI environment - citest_starttest($testnum); + if(citest_starttest($testnum)) { + return (-1, 0); + } if(runnerac_test_preprocess($runnerid, $testnum)) { logmsg "ERROR: runner $runnerid seems to have died\n";