From 4ead4285a6af5d5645d4ad6e17a4df40ab53e297 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Jun 2026 14:25:51 +0200 Subject: [PATCH] tests: enhance names, remove duplicates - test 1030: remove, duplicate of 154 - test 1105: make name unique - test 161: make name reflect what it tests - test 2074: correct the name - test 310: improve name - test 358: correct the name - test 409: removed, duplicate of 401 - test 472: clarify the test name (how it differs from 439) - test 1509: update name - test 527: duplicate of 526 - test 758: separate the name from 530 - test 611: duplicate of 608, remove - test 639: adjust the name - test 688: minor name tweak to clarify - test 708: enhance name - test 800/847: clarify the names - test 1520: dedupe the name - test 962: enhance name - test 1196/2203: enhanced names - test 1211: name tweak - test 1256/1257: enhance the names - test 1483: fix name - test 1541: fix name - test 1553: fix name - test 1609: removed, exact duplicate of 1607 - test 2200: fix name - test 3031: corret the name - test 3016/3203: fix names and keywords - test 3201/3220: enhance names - test 3212: fix name - add missing FILE keywords - drop FAILURE as keyword Closes #21936 --- tests/data/Makefile.am | 10 ++-- tests/data/test1007 | 1 - tests/data/test1030 | 108 ----------------------------------------- tests/data/test1034 | 1 - tests/data/test1035 | 1 - tests/data/test1042 | 1 - tests/data/test1059 | 1 - tests/data/test1063 | 1 - tests/data/test1084 | 1 - tests/data/test1085 | 1 - tests/data/test1086 | 1 - tests/data/test1096 | 1 - tests/data/test1099 | 1 - tests/data/test1105 | 2 +- tests/data/test111 | 1 - tests/data/test1112 | 1 - tests/data/test1120 | 1 - tests/data/test113 | 1 - tests/data/test114 | 1 - tests/data/test115 | 1 - tests/data/test1152 | 1 - tests/data/test116 | 1 - tests/data/test117 | 1 - tests/data/test118 | 1 - tests/data/test119 | 1 - tests/data/test1196 | 2 +- tests/data/test1208 | 1 - tests/data/test1209 | 1 - tests/data/test1211 | 3 +- tests/data/test1234 | 1 - tests/data/test1236 | 1 - tests/data/test1238 | 1 - tests/data/test125 | 1 - tests/data/test1256 | 2 +- tests/data/test1257 | 2 +- tests/data/test1409 | 1 - tests/data/test1410 | 1 - tests/data/test1422 | 1 + tests/data/test1423 | 1 + tests/data/test1447 | 1 - tests/data/test1453 | 1 - tests/data/test1469 | 1 - tests/data/test1471 | 1 - tests/data/test1472 | 1 - tests/data/test1483 | 2 +- tests/data/test1509 | 2 +- tests/data/test1515 | 1 - tests/data/test1516 | 1 - tests/data/test1520 | 2 +- tests/data/test1541 | 2 +- tests/data/test1553 | 2 +- tests/data/test1609 | 19 -------- tests/data/test161 | 2 +- tests/data/test162 | 1 - tests/data/test19 | 1 - tests/data/test190 | 1 - tests/data/test20 | 1 - tests/data/test201 | 1 - tests/data/test205 | 1 - tests/data/test207 | 1 - tests/data/test2074 | 2 +- tests/data/test21 | 1 - tests/data/test2200 | 2 +- tests/data/test2203 | 2 +- tests/data/test221 | 1 - tests/data/test223 | 1 - tests/data/test225 | 1 - tests/data/test226 | 1 - tests/data/test229 | 1 - tests/data/test23 | 1 - tests/data/test256 | 1 - tests/data/test283 | 1 - tests/data/test289 | 1 - tests/data/test29 | 1 - tests/data/test293 | 1 - tests/data/test295 | 1 - tests/data/test30 | 1 - tests/data/test3016 | 4 +- tests/data/test302 | 1 - tests/data/test303 | 1 - tests/data/test3031 | 2 +- tests/data/test305 | 1 - tests/data/test308 | 1 - tests/data/test310 | 2 +- tests/data/test315 | 1 - tests/data/test3201 | 2 +- tests/data/test3203 | 4 +- tests/data/test321 | 1 - tests/data/test3212 | 4 +- tests/data/test3217 | 1 - tests/data/test3218 | 1 - tests/data/test322 | 1 - tests/data/test3220 | 2 +- tests/data/test323 | 1 - tests/data/test324 | 1 - tests/data/test332 | 1 - tests/data/test358 | 2 +- tests/data/test36 | 1 - tests/data/test37 | 1 - tests/data/test38 | 1 - tests/data/test390 | 1 + tests/data/test393 | 1 - tests/data/test394 | 1 - tests/data/test402 | 1 - tests/data/test403 | 1 - tests/data/test404 | 1 - tests/data/test405 | 1 - tests/data/test409 | 58 ---------------------- tests/data/test41 | 1 - tests/data/test419 | 1 - tests/data/test472 | 2 +- tests/data/test504 | 1 - tests/data/test507 | 1 - tests/data/test527 | 64 ------------------------ tests/data/test538 | 1 - tests/data/test594 | 1 - tests/data/test604 | 1 - tests/data/test605 | 1 - tests/data/test606 | 1 - tests/data/test607 | 1 - tests/data/test609 | 1 - tests/data/test611 | 42 ---------------- tests/data/test615 | 1 - tests/data/test620 | 1 - tests/data/test621 | 1 - tests/data/test622 | 1 - tests/data/test623 | 1 - tests/data/test626 | 1 - tests/data/test628 | 1 - tests/data/test629 | 1 - tests/data/test630 | 1 - tests/data/test631 | 1 - tests/data/test632 | 1 - tests/data/test639 | 2 +- tests/data/test656 | 1 - tests/data/test688 | 2 +- tests/data/test702 | 1 - tests/data/test703 | 1 - tests/data/test704 | 1 - tests/data/test705 | 1 - tests/data/test708 | 2 +- tests/data/test75 | 1 - tests/data/test758 | 2 +- tests/data/test800 | 2 +- tests/data/test803 | 1 - tests/data/test847 | 2 +- tests/data/test852 | 1 - tests/data/test855 | 1 - tests/data/test856 | 1 - tests/data/test87 | 1 - tests/data/test94 | 1 - tests/data/test962 | 2 +- tests/data/test99 | 1 - 153 files changed, 39 insertions(+), 446 deletions(-) delete mode 100644 tests/data/test1030 delete mode 100644 tests/data/test1609 delete mode 100644 tests/data/test409 delete mode 100644 tests/data/test527 delete mode 100644 tests/data/test611 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index a7c293cb20..8c693f4e7f 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -70,7 +70,7 @@ test370 test371 test372 test373 test374 test375 test376 test378 test379 \ test380 test381 test383 test384 test385 test386 test387 test388 test389 \ test390 test391 test392 test393 test394 test395 test396 test397 test398 \ test399 test400 test401 test402 test403 test404 test405 test406 test407 \ -test408 test409 test410 test411 test412 test413 test414 test415 test416 \ +test408 test410 test411 test412 test413 test414 test415 test416 \ test417 test418 test419 test420 test421 test422 test423 test424 test425 \ test426 test427 test428 test429 test430 test431 test432 test433 test434 \ test435 test436 test437 test438 test439 test440 test441 test442 test443 \ @@ -82,7 +82,7 @@ test483 test484 test485 test486 test487 test488 test489 test490 test491 \ test492 test493 test494 test495 test496 test497 test498 test499 test500 \ test501 test502 test503 test504 test505 test506 test507 test508 test509 \ test510 test511 test512 test513 test514 test515 test516 test517 test518 \ -test519 test520 test521 test522 test523 test524 test525 test526 test527 \ +test519 test520 test521 test522 test523 test524 test525 test526 \ test528 test529 test530 test531 test532 test533 test534 test535 test536 \ test537 test538 test539 test540 test541 test542 test543 test544 test545 \ test546 test547 test548 test549 test550 test551 test552 test553 test554 \ @@ -92,7 +92,7 @@ test573 test574 test575 test576 test577 test578 test579 test580 test581 \ test582 test583 test584 test585 test586 test587 test588 test589 test590 \ test591 test592 test593 test594 test595 test596 test597 test598 test599 \ test600 test601 test602 test603 test604 test605 test606 test607 test608 \ -test609 test610 test611 test612 test613 test614 test615 test616 test617 \ +test609 test610 test612 test613 test614 test615 test616 test617 \ test618 test619 test620 test621 test622 test623 test624 test625 test626 \ test627 test628 test629 test630 test631 test632 test633 test634 test635 \ test636 test637 test638 test639 test640 test641 test642 test643 test644 \ @@ -139,7 +139,7 @@ test997 test998 test999 test1000 test1001 test1002 test1003 test1004 \ test1005 test1006 test1007 test1008 test1009 test1010 test1011 test1012 \ test1013 test1014 test1015 test1016 test1017 test1018 test1019 test1020 \ test1021 test1022 test1023 test1024 test1025 test1026 test1027 test1028 \ -test1029 test1030 test1031 test1032 test1033 test1034 test1035 test1036 \ +test1029 test1031 test1032 test1033 test1034 test1035 test1036 \ test1037 test1038 test1039 test1040 test1041 test1042 test1043 test1044 \ test1045 test1046 test1047 test1048 test1049 test1050 test1051 test1052 \ test1053 test1054 test1055 test1056 test1057 test1058 test1059 test1060 \ @@ -211,7 +211,7 @@ test1573 test1574 test1575 test1576 test1577 test1578 test1579 test1580 \ test1581 test1582 test1583 test1584 test1585 test1586 test1587 test1588 \ test1589 test1590 test1591 test1592 test1593 test1594 test1595 test1596 \ test1597 test1598 test1599 test1600 test1601 test1602 test1603 test1604 \ -test1605 test1606 test1607 test1608 test1609 test1610 test1611 test1612 \ +test1605 test1606 test1607 test1608 test1610 test1611 test1612 \ test1613 test1614 test1615 test1616 test1617 test1618 test1619 test1620 \ test1621 test1622 test1623 test1624 test1625 test1626 test1627 test1628 \ test1629 test1630 test1631 test1632 test1633 test1634 test1635 test1636 \ diff --git a/tests/data/test1007 b/tests/data/test1007 index fdd6af2c9a..2706c049a5 100644 --- a/tests/data/test1007 +++ b/tests/data/test1007 @@ -4,7 +4,6 @@ TFTP TFTP WRQ -FAILURE diff --git a/tests/data/test1030 b/tests/data/test1030 deleted file mode 100644 index ddf7370eaa..0000000000 --- a/tests/data/test1030 +++ /dev/null @@ -1,108 +0,0 @@ - - - - -HTTP -HTTP PUT -HTTP Digest auth ---anyauth - - - -# Server-side - - -HTTP/1.1 401 Authorization Required -Server: Apache/1.3.27 (Darwin) PHP/4.1.2 -WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts" -WWW-Authenticate: Basic realm="gimme all yer s3cr3ts" -WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344" -Content-Length: 26 -Content-Type: text/html; charset=iso-8859-1 - -This is not the real page - - -# This is supposed to be returned when the server gets a -# Authorization: Digest line passed-in from the client - -HTTP/1.1 200 OK -Server: Apache/1.3.27 (Darwin) PHP/4.1.2 -Content-Type: text/html; charset=iso-8859-1 -Content-Length: 23 -Connection: close - -This IS the real page! - - - -HTTP/1.1 401 Authorization Required -Server: Apache/1.3.27 (Darwin) PHP/4.1.2 -WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts" -WWW-Authenticate: Basic realm="gimme all yer s3cr3ts" -WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344" -Content-Length: 26 -Content-Type: text/html; charset=iso-8859-1 - -HTTP/1.1 200 OK -Server: Apache/1.3.27 (Darwin) PHP/4.1.2 -Content-Type: text/html; charset=iso-8859-1 -Content-Length: 23 -Connection: close - -This IS the real page! - - - - -# Client-side - - -http - - -!SSPI -crypto -digest - - -HTTP PUT with --anyauth authorization (picking Digest) - - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - - -This is data we upload with PUT -a second line -line three -four is the number of lines - - - -# Verify data after the test has been "shot" - - -PUT /%TESTNUMBER HTTP/1.1 -Host: %HOSTIP:%HTTPPORT -User-Agent: curl/%VERSION -Accept: */* -Content-Length: 85 - -This is data we upload with PUT -a second line -line three -four is the number of lines -PUT /%TESTNUMBER HTTP/1.1 -Host: %HOSTIP:%HTTPPORT -Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9" -User-Agent: curl/%VERSION -Accept: */* -Content-Length: 85 - -This is data we upload with PUT -a second line -line three -four is the number of lines - - - diff --git a/tests/data/test1034 b/tests/data/test1034 index 8d0c470e51..be48039b54 100644 --- a/tests/data/test1034 +++ b/tests/data/test1034 @@ -6,7 +6,6 @@ HTTP HTTP GET HTTP proxy IDN -FAILURE config file diff --git a/tests/data/test1035 b/tests/data/test1035 index fe8ae115b2..9139a41aa3 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -6,7 +6,6 @@ HTTP HTTP GET HTTP proxy IDN -FAILURE diff --git a/tests/data/test1042 b/tests/data/test1042 index 66ac19f4fd..22b1acc03e 100644 --- a/tests/data/test1042 +++ b/tests/data/test1042 @@ -5,7 +5,6 @@ HTTP HTTP GET Resume -FAILURE diff --git a/tests/data/test1059 b/tests/data/test1059 index c982ec3ac1..1cb2ff836a 100644 --- a/tests/data/test1059 +++ b/tests/data/test1059 @@ -6,7 +6,6 @@ HTTP HTTP CONNECT proxytunnel FTP -FAILURE diff --git a/tests/data/test1063 b/tests/data/test1063 index 0e95511d27..28b97be29f 100644 --- a/tests/data/test1063 +++ b/tests/data/test1063 @@ -4,7 +4,6 @@ FILE Range -FAILURE diff --git a/tests/data/test1084 b/tests/data/test1084 index 975c751b16..66335111f8 100644 --- a/tests/data/test1084 +++ b/tests/data/test1084 @@ -5,7 +5,6 @@ HTTP HTTP GET --interface -FAILURE non-existing host diff --git a/tests/data/test1085 b/tests/data/test1085 index 8a2bbd8c90..2b692ffee3 100644 --- a/tests/data/test1085 +++ b/tests/data/test1085 @@ -6,7 +6,6 @@ HTTP HTTP GET --interface IPv6 -FAILURE non-existing host diff --git a/tests/data/test1086 b/tests/data/test1086 index efb51c413b..440aadfa0e 100644 --- a/tests/data/test1086 +++ b/tests/data/test1086 @@ -6,7 +6,6 @@ FTP EPSV RETR timeout -FAILURE SLOWDOWNDATA flaky timing-dependent diff --git a/tests/data/test1096 b/tests/data/test1096 index 0485f7c2e3..971aef1cb1 100644 --- a/tests/data/test1096 +++ b/tests/data/test1096 @@ -5,7 +5,6 @@ FTP PASV RETR -FAILURE # Server-side diff --git a/tests/data/test1099 b/tests/data/test1099 index 7539832ca4..a38038713f 100644 --- a/tests/data/test1099 +++ b/tests/data/test1099 @@ -4,7 +4,6 @@ TFTP TFTP RRQ -FAILURE diff --git a/tests/data/test1105 b/tests/data/test1105 index 7d4df9556c..45251d3e7c 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -33,7 +33,7 @@ Set-Cookie: bar=foo%TABbar http -HTTP with cookie parser and header recording +HTTP POST with cookies "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing%AMPparm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname%AMPpassword=mypassword" diff --git a/tests/data/test111 b/tests/data/test111 index 655cc0c275..10fbfa91cf 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -5,7 +5,6 @@ FTP EPSV Resume -FAILURE # Server-side diff --git a/tests/data/test1112 b/tests/data/test1112 index 0d9e19ef80..45ce8e0740 100644 --- a/tests/data/test1112 +++ b/tests/data/test1112 @@ -7,7 +7,6 @@ FTPS EPSV RETR timeout -FAILURE SLOWDOWNDATA timing-dependent diff --git a/tests/data/test1120 b/tests/data/test1120 index 1450056334..e5c223aa06 100644 --- a/tests/data/test1120 +++ b/tests/data/test1120 @@ -7,7 +7,6 @@ PORT RETR 421 timeout -FAILURE # Server-side diff --git a/tests/data/test113 b/tests/data/test113 index 6a7266031d..68637a12b8 100644 --- a/tests/data/test113 +++ b/tests/data/test113 @@ -3,7 +3,6 @@ FTP -FAILURE # Server-side diff --git a/tests/data/test114 b/tests/data/test114 index 850584479d..6972e6a835 100644 --- a/tests/data/test114 +++ b/tests/data/test114 @@ -3,7 +3,6 @@ FTP -FAILURE # Server-side diff --git a/tests/data/test115 b/tests/data/test115 index 00b300a58e..5fe1a74a61 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -4,7 +4,6 @@ FTP PASV -FAILURE # Server-side diff --git a/tests/data/test1152 b/tests/data/test1152 index 692f51faa0..dfbde558d0 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -3,7 +3,6 @@ FTP -FAILURE # Server-side diff --git a/tests/data/test116 b/tests/data/test116 index fe519c5bbf..3ce674e401 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -5,7 +5,6 @@ FTP EPRT PORT -FAILURE EPRT refused diff --git a/tests/data/test117 b/tests/data/test117 index 9142e15c2e..6fdbb33a58 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -3,7 +3,6 @@ FTP -FAILURE # Server-side diff --git a/tests/data/test118 b/tests/data/test118 index 148e7d6e4d..67c17065d5 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -5,7 +5,6 @@ FTP PASV RETR -FAILURE # Server-side diff --git a/tests/data/test119 b/tests/data/test119 index 8b6ef10339..5f9140ff2c 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -5,7 +5,6 @@ FTP PORT RETR -FAILURE # Server-side diff --git a/tests/data/test1196 b/tests/data/test1196 index dc79141cb3..118c52a336 100644 --- a/tests/data/test1196 +++ b/tests/data/test1196 @@ -28,7 +28,7 @@ mqtt mqtt -MQTT with error in CONNACK +MQTT with "unaccaptable protocol version" CONNACK mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER diff --git a/tests/data/test1208 b/tests/data/test1208 index 124419b6dc..8ae1e3acbe 100644 --- a/tests/data/test1208 +++ b/tests/data/test1208 @@ -7,7 +7,6 @@ PORT RETR NODATACONN150 timeout -FAILURE flaky timing-dependent diff --git a/tests/data/test1209 b/tests/data/test1209 index 8eb540a22c..449e8f5fa9 100644 --- a/tests/data/test1209 +++ b/tests/data/test1209 @@ -7,7 +7,6 @@ PORT RETR NODATACONN timeout -FAILURE # Server-side diff --git a/tests/data/test1211 b/tests/data/test1211 index cb66fae8c5..eb267d9dcb 100644 --- a/tests/data/test1211 +++ b/tests/data/test1211 @@ -7,7 +7,6 @@ PORT RETR NODATACONN425 timeout -FAILURE # Server-side @@ -26,7 +25,7 @@ NODATACONN425 ftp -FTP PORT and 425 on download +FTP PORT and 425 on download and timeout ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1234 b/tests/data/test1234 index e7ffbf2eec..bb3cde5974 100644 --- a/tests/data/test1234 +++ b/tests/data/test1234 @@ -4,7 +4,6 @@ globbing {} list -FAILURE # Server-side diff --git a/tests/data/test1236 b/tests/data/test1236 index 0d31ac1f4a..2b7318516d 100644 --- a/tests/data/test1236 +++ b/tests/data/test1236 @@ -3,7 +3,6 @@ globbing -FAILURE # Server-side diff --git a/tests/data/test1238 b/tests/data/test1238 index a8fbc8a3f0..9c2e22091b 100644 --- a/tests/data/test1238 +++ b/tests/data/test1238 @@ -5,7 +5,6 @@ TFTP TFTP RRQ timeout -FAILURE DELAY diff --git a/tests/data/test125 b/tests/data/test125 index ef2591d4a7..1f28daaf0f 100644 --- a/tests/data/test125 +++ b/tests/data/test125 @@ -3,7 +3,6 @@ FTP -FAILURE # Server-side diff --git a/tests/data/test1256 b/tests/data/test1256 index d35ee627e1..7db26428ec 100644 --- a/tests/data/test1256 +++ b/tests/data/test1256 @@ -29,7 +29,7 @@ foo http -http_proxy, override NO_PROXY by --noproxy and target URL through proxy +http_proxy, override NO_PROXY by --noproxy host http_proxy=http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1257 b/tests/data/test1257 index 40f1028c5c..fc6f56e33c 100644 --- a/tests/data/test1257 +++ b/tests/data/test1257 @@ -29,7 +29,7 @@ foo http -http_proxy, override NO_PROXY by --noproxy and target URL through proxy +http_proxy, override NO_PROXY by --noproxy "" http_proxy=http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1409 b/tests/data/test1409 index 153d4a0644..50d00e44d7 100644 --- a/tests/data/test1409 +++ b/tests/data/test1409 @@ -3,7 +3,6 @@ cmdline -FAILURE diff --git a/tests/data/test1410 b/tests/data/test1410 index 4f1b39113e..e5d8660e78 100644 --- a/tests/data/test1410 +++ b/tests/data/test1410 @@ -3,7 +3,6 @@ cmdline -FAILURE diff --git a/tests/data/test1422 b/tests/data/test1422 index d51cd6e7f5..b7f856c13e 100644 --- a/tests/data/test1422 +++ b/tests/data/test1422 @@ -3,6 +3,7 @@ HTTP +FILE HTTP GET -J diff --git a/tests/data/test1423 b/tests/data/test1423 index 4acc0757b2..b42d369d7c 100644 --- a/tests/data/test1423 +++ b/tests/data/test1423 @@ -3,6 +3,7 @@ HTTP +FILE HTTP GET diff --git a/tests/data/test1447 b/tests/data/test1447 index 4b0ed1b584..ea68ef9230 100644 --- a/tests/data/test1447 +++ b/tests/data/test1447 @@ -3,7 +3,6 @@ HTTP proxy -FAILURE # Server-side diff --git a/tests/data/test1453 b/tests/data/test1453 index 3b17296335..5d2166332c 100644 --- a/tests/data/test1453 +++ b/tests/data/test1453 @@ -3,7 +3,6 @@ Too long tftp filename -FAILURE # Server-side diff --git a/tests/data/test1469 b/tests/data/test1469 index 4ca24418f9..3b742c1b2c 100644 --- a/tests/data/test1469 +++ b/tests/data/test1469 @@ -4,7 +4,6 @@ FTP URL -FAILURE diff --git a/tests/data/test1471 b/tests/data/test1471 index ffd3ef59ab..70c454b0a4 100644 --- a/tests/data/test1471 +++ b/tests/data/test1471 @@ -4,7 +4,6 @@ Onion Tor -FAILURE # Server-side diff --git a/tests/data/test1472 b/tests/data/test1472 index 26fb456808..b9e2d6dd67 100644 --- a/tests/data/test1472 +++ b/tests/data/test1472 @@ -4,7 +4,6 @@ Onion Tor -FAILURE # Server-side diff --git a/tests/data/test1483 b/tests/data/test1483 index eb19317706..c7373b2a46 100644 --- a/tests/data/test1483 +++ b/tests/data/test1483 @@ -51,7 +51,7 @@ writedelay: 10 http -HTTP GET with double chunked in TE header +HTTP GET with two Transfer-Encoding: chunked headers http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER diff --git a/tests/data/test1509 b/tests/data/test1509 index afb1a66139..7e57cd0fad 100644 --- a/tests/data/test1509 +++ b/tests/data/test1509 @@ -58,7 +58,7 @@ lib%TESTNUMBER proxy -simple multi http:// through proxytunnel with authentication info +http:// through proxytunnel http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test1515 b/tests/data/test1515 index ac3ad254b8..2fca5beb70 100644 --- a/tests/data/test1515 +++ b/tests/data/test1515 @@ -5,7 +5,6 @@ HTTP multi -FAILURE resolve diff --git a/tests/data/test1516 b/tests/data/test1516 index 704a791646..02f2c6d84f 100644 --- a/tests/data/test1516 +++ b/tests/data/test1516 @@ -5,7 +5,6 @@ HTTP multi -FAILURE resolve diff --git a/tests/data/test1520 b/tests/data/test1520 index 07ccdf281c..c26c08866f 100644 --- a/tests/data/test1520 +++ b/tests/data/test1520 @@ -17,7 +17,7 @@ lib%TESTNUMBER -SMTP with CRLF-dot-CRLF in data +SMTP with CRLF-dot-CRLF in upload payload From: different diff --git a/tests/data/test1541 b/tests/data/test1541 index ecba40ff93..2f030cc904 100644 --- a/tests/data/test1541 +++ b/tests/data/test1541 @@ -56,7 +56,7 @@ http lib%TESTNUMBER -chunked with trailers and pausing the receive +CURLINFO timer check http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1553 b/tests/data/test1553 index fbf5390b15..84f3830852 100644 --- a/tests/data/test1553 +++ b/tests/data/test1553 @@ -34,7 +34,7 @@ Mime imap -IMAP cleanup before a connection was created +IMAP cleanup with non-existing hostname # tool is what to use instead of 'curl' diff --git a/tests/data/test1609 b/tests/data/test1609 deleted file mode 100644 index 5153174a3a..0000000000 --- a/tests/data/test1609 +++ /dev/null @@ -1,19 +0,0 @@ - - - - -unittest -CURLOPT_RESOLVE - - - -# Client-side - - -unittest - - -CURLOPT_RESOLVE parsing - - - diff --git a/tests/data/test161 b/tests/data/test161 index 16fdaf4186..23db19005e 100644 --- a/tests/data/test161 +++ b/tests/data/test161 @@ -23,7 +23,7 @@ PASV ftp -FTP RETR PASV +FTP RETR partial file ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test162 b/tests/data/test162 index cef8fc2f08..d03df40bb4 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -6,7 +6,6 @@ HTTP HTTP GET HTTP proxy HTTP proxy NTLM auth -FAILURE diff --git a/tests/data/test19 b/tests/data/test19 index 0c1b08b4c0..814163859c 100644 --- a/tests/data/test19 +++ b/tests/data/test19 @@ -4,7 +4,6 @@ HTTP connect to non-listen -FAILURE # Server-side diff --git a/tests/data/test190 b/tests/data/test190 index 4b4da41b62..f59f871d6a 100644 --- a/tests/data/test190 +++ b/tests/data/test190 @@ -4,7 +4,6 @@ FTP timeout -FAILURE DELAY diff --git a/tests/data/test20 b/tests/data/test20 index a851ba30d0..5dfe22dcd7 100644 --- a/tests/data/test20 +++ b/tests/data/test20 @@ -3,7 +3,6 @@ HTTP -FAILURE non-existing host diff --git a/tests/data/test201 b/tests/data/test201 index 7a1699d3e4..ac1593c8e2 100644 --- a/tests/data/test201 +++ b/tests/data/test201 @@ -3,7 +3,6 @@ FILE -FAILURE diff --git a/tests/data/test205 b/tests/data/test205 index 2785625323..3324d7d64f 100644 --- a/tests/data/test205 +++ b/tests/data/test205 @@ -3,7 +3,6 @@ FILE -FAILURE diff --git a/tests/data/test207 b/tests/data/test207 index f1c0cf81fb..8ac782f067 100644 --- a/tests/data/test207 +++ b/tests/data/test207 @@ -5,7 +5,6 @@ HTTP HTTP GET CURLE_PARTIAL_FILE -FAILURE chunked Transfer-Encoding diff --git a/tests/data/test2074 b/tests/data/test2074 index c1571231a2..0967031906 100644 --- a/tests/data/test2074 +++ b/tests/data/test2074 @@ -32,7 +32,7 @@ Funny-head: yesyes http -HTTP GET +HTTP with oauth2-bearer http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test21 b/tests/data/test21 index af47cf914e..8f3da43b81 100644 --- a/tests/data/test21 +++ b/tests/data/test21 @@ -2,7 +2,6 @@ -FAILURE multiple HTTP requests diff --git a/tests/data/test2200 b/tests/data/test2200 index 95baca6bc0..bc1652eb2e 100644 --- a/tests/data/test2200 +++ b/tests/data/test2200 @@ -28,7 +28,7 @@ mqtt mqtt -MQTT SUBSCRIBE with user and password +MQTT SUBSCRIBE with user and password, not authorized mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -u fakeuser:fakepasswd diff --git a/tests/data/test2203 b/tests/data/test2203 index 9d8c1da679..9dcfedadaf 100644 --- a/tests/data/test2203 +++ b/tests/data/test2203 @@ -28,7 +28,7 @@ mqtt mqtt -MQTT with error in CONNACK +MQTT with "no user or password" CONNACK mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER diff --git a/tests/data/test221 b/tests/data/test221 index 5a7d082e79..03f6d05055 100644 --- a/tests/data/test221 +++ b/tests/data/test221 @@ -5,7 +5,6 @@ HTTP HTTP GET compressed -FAILURE # Server-side diff --git a/tests/data/test223 b/tests/data/test223 index 9912d3d471..660c85da12 100644 --- a/tests/data/test223 +++ b/tests/data/test223 @@ -5,7 +5,6 @@ HTTP HTTP GET compressed -FAILURE # Server-side diff --git a/tests/data/test225 b/tests/data/test225 index 1ce22088ee..403bd2fec2 100644 --- a/tests/data/test225 +++ b/tests/data/test225 @@ -3,7 +3,6 @@ FTP -FAILURE # Client-side diff --git a/tests/data/test226 b/tests/data/test226 index 1872981d64..dbf6d1af38 100644 --- a/tests/data/test226 +++ b/tests/data/test226 @@ -3,7 +3,6 @@ FTP -FAILURE diff --git a/tests/data/test229 b/tests/data/test229 index b90214ff51..bd911db9ee 100644 --- a/tests/data/test229 +++ b/tests/data/test229 @@ -4,7 +4,6 @@ FTP ACCT -FAILURE # Server-side diff --git a/tests/data/test23 b/tests/data/test23 index 1771fe9e15..8126025b90 100644 --- a/tests/data/test23 +++ b/tests/data/test23 @@ -3,7 +3,6 @@ unsupported scheme -FAILURE # Server-side diff --git a/tests/data/test256 b/tests/data/test256 index 3bf44c5770..cc4d7e209d 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -6,7 +6,6 @@ HTTP HTTP GET HTTP proxy Resume -FAILURE # Server-side diff --git a/tests/data/test283 b/tests/data/test283 index 3ca5bd1e0d..051e58c87c 100644 --- a/tests/data/test283 +++ b/tests/data/test283 @@ -4,7 +4,6 @@ TFTP TFTP RRQ -FAILURE diff --git a/tests/data/test289 b/tests/data/test289 index cf8464b1b6..4253c1b776 100644 --- a/tests/data/test289 +++ b/tests/data/test289 @@ -5,7 +5,6 @@ FTP STOR Resume -FAILURE diff --git a/tests/data/test29 b/tests/data/test29 index 122cfd23b7..df67f85019 100644 --- a/tests/data/test29 +++ b/tests/data/test29 @@ -5,7 +5,6 @@ HTTP HTTP GET timeout -FAILURE # Server-side diff --git a/tests/data/test293 b/tests/data/test293 index cc6cccb41e..c6f69f2e01 100644 --- a/tests/data/test293 +++ b/tests/data/test293 @@ -5,7 +5,6 @@ HTTP HTTP GET --max-filesize -FAILURE diff --git a/tests/data/test295 b/tests/data/test295 index 1eb14475fb..e7fbf6745c 100644 --- a/tests/data/test295 +++ b/tests/data/test295 @@ -6,7 +6,6 @@ FTP PASV LIST ACCT -FAILURE # Server-side diff --git a/tests/data/test30 b/tests/data/test30 index c8984105f8..c0b5d60d43 100644 --- a/tests/data/test30 +++ b/tests/data/test30 @@ -4,7 +4,6 @@ HTTP HTTP GET -FAILURE # Server-side diff --git a/tests/data/test3016 b/tests/data/test3016 index 2d530f55c0..c710e39762 100644 --- a/tests/data/test3016 +++ b/tests/data/test3016 @@ -2,8 +2,6 @@ -HTTP -HTTP GET FILE @@ -14,7 +12,7 @@ FILE file -GET a directory using file:// +Get current directory using file:// diff --git a/tests/data/test302 b/tests/data/test302 index 1bae0c7641..3c6eb09851 100644 --- a/tests/data/test302 +++ b/tests/data/test302 @@ -6,7 +6,6 @@ HTTPS HTTP GET HTTP CONNECT HTTP proxy -FAILURE diff --git a/tests/data/test303 b/tests/data/test303 index 44060b496e..51dc471e61 100644 --- a/tests/data/test303 +++ b/tests/data/test303 @@ -5,7 +5,6 @@ HTTPS HTTP GET timeout -FAILURE diff --git a/tests/data/test3031 b/tests/data/test3031 index bf41ac78db..68ffb46691 100644 --- a/tests/data/test3031 +++ b/tests/data/test3031 @@ -32,7 +32,7 @@ http http ---output-dir with --create-dirs +--dump-header with --create-dirs http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER --dump-header %PWD/%LOGDIR/tmp/out.txt --create-dirs diff --git a/tests/data/test305 b/tests/data/test305 index 57d33938e1..1acefe29be 100644 --- a/tests/data/test305 +++ b/tests/data/test305 @@ -4,7 +4,6 @@ HTTPS HTTP GET -FAILURE diff --git a/tests/data/test308 b/tests/data/test308 index 60274f489d..593976b4c2 100644 --- a/tests/data/test308 +++ b/tests/data/test308 @@ -4,7 +4,6 @@ HTTPS HTTP GET -FAILURE diff --git a/tests/data/test310 b/tests/data/test310 index 558f137d8a..12a12a4f15 100644 --- a/tests/data/test310 +++ b/tests/data/test310 @@ -31,7 +31,7 @@ local-http https test-localhost.pem -simple HTTPS GET +HTTPS GET with specified CA cert bundle -4 --cacert %CERTDIR/certs/test-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test315 b/tests/data/test315 index 62499204a2..31d812cd05 100644 --- a/tests/data/test315 +++ b/tests/data/test315 @@ -5,7 +5,6 @@ HTTP HTTP GET compressed -FAILURE # Server-side diff --git a/tests/data/test3201 b/tests/data/test3201 index 7e051a2167..cf98f4f0a3 100644 --- a/tests/data/test3201 +++ b/tests/data/test3201 @@ -33,7 +33,7 @@ Funny-head: barkbark http -HTTP GET when PROXY Protocol enabled and spoofed client IP +HTTP GET when PROXY Protocol enabled and spoofed client IPv4 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --haproxy-clientip "192.168.1.1" -H "Testno: %TESTNUMBER" diff --git a/tests/data/test3203 b/tests/data/test3203 index 6a54814060..401f697419 100644 --- a/tests/data/test3203 +++ b/tests/data/test3203 @@ -2,8 +2,6 @@ -HTTP -HTTP GET FILE @@ -14,7 +12,7 @@ FILE file -GET a directory using file:// +Get a directory using file:// diff --git a/tests/data/test321 b/tests/data/test321 index cdc18028b9..ca258c078d 100644 --- a/tests/data/test321 +++ b/tests/data/test321 @@ -4,7 +4,6 @@ HTTPS TLS-SRP -FAILURE diff --git a/tests/data/test3212 b/tests/data/test3212 index 826c961a4d..3c5cd37e7f 100644 --- a/tests/data/test3212 +++ b/tests/data/test3212 @@ -3,7 +3,7 @@ unittest -uint_bset +uint32_tbl @@ -13,7 +13,7 @@ uint_bset unittest -uint_bset unit tests +uint32_tbl unit tests diff --git a/tests/data/test3217 b/tests/data/test3217 index df7c890eba..4749779b67 100644 --- a/tests/data/test3217 +++ b/tests/data/test3217 @@ -5,7 +5,6 @@ FTP PASV RETR -FAILURE # Server-side diff --git a/tests/data/test3218 b/tests/data/test3218 index 0c98b202ec..a56b9a2b98 100644 --- a/tests/data/test3218 +++ b/tests/data/test3218 @@ -5,7 +5,6 @@ FTP PASV RETR -FAILURE # Server-side diff --git a/tests/data/test322 b/tests/data/test322 index c0581088ae..e0aca6b28e 100644 --- a/tests/data/test322 +++ b/tests/data/test322 @@ -4,7 +4,6 @@ HTTPS TLS-SRP -FAILURE diff --git a/tests/data/test3220 b/tests/data/test3220 index ba8dec8f92..ca8bfaa134 100644 --- a/tests/data/test3220 +++ b/tests/data/test3220 @@ -33,7 +33,7 @@ Funny-head: barkbark http -HTTP GET when PROXY Protocol enabled and spoofed client IP +HTTP GET when PROXY Protocol enabled and spoofed client IPv6 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --haproxy-clientip "2a04:4e42::347" -H "Testno: %TESTNUMBER" diff --git a/tests/data/test323 b/tests/data/test323 index e8f45c5ef8..ba09253c0f 100644 --- a/tests/data/test323 +++ b/tests/data/test323 @@ -4,7 +4,6 @@ HTTPS TLS-SRP -FAILURE diff --git a/tests/data/test324 b/tests/data/test324 index a91301fe1d..d85fecb9b3 100644 --- a/tests/data/test324 +++ b/tests/data/test324 @@ -4,7 +4,6 @@ HTTPS TLS-SRP -FAILURE diff --git a/tests/data/test332 b/tests/data/test332 index b7a7e6000d..e968c26fe4 100644 --- a/tests/data/test332 +++ b/tests/data/test332 @@ -4,7 +4,6 @@ TFTP TFTP RRQ -FAILURE diff --git a/tests/data/test358 b/tests/data/test358 index ac7f3d57e4..99035cc049 100644 --- a/tests/data/test358 +++ b/tests/data/test358 @@ -36,7 +36,7 @@ http http/2 -HTTPS GET translated by alt-svc lookup to HTTP/2 GET +HTTP GET translated by alt-svc lookup to HTTP/2 GET # make Debug-curl accept Alt-Svc over plain HTTP diff --git a/tests/data/test36 b/tests/data/test36 index ea97f6160b..a99e560bdc 100644 --- a/tests/data/test36 +++ b/tests/data/test36 @@ -5,7 +5,6 @@ HTTP HTTP GET chunked Transfer-Encoding -FAILURE # Server-side diff --git a/tests/data/test37 b/tests/data/test37 index cf45509547..46f994f1e7 100644 --- a/tests/data/test37 +++ b/tests/data/test37 @@ -4,7 +4,6 @@ HTTP HTTP GET -FAILURE # Server-side diff --git a/tests/data/test38 b/tests/data/test38 index 842b0e535e..05afab2829 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -5,7 +5,6 @@ HTTP HTTP GET Resume -FAILURE # Server-side diff --git a/tests/data/test390 b/tests/data/test390 index 7a5faaf836..0489d9be86 100644 --- a/tests/data/test390 +++ b/tests/data/test390 @@ -3,6 +3,7 @@ HTTP +FILE FTP parallel diff --git a/tests/data/test393 b/tests/data/test393 index fbf07d7c60..3353da688a 100644 --- a/tests/data/test393 +++ b/tests/data/test393 @@ -5,7 +5,6 @@ HTTP HTTP GET --max-filesize -FAILURE diff --git a/tests/data/test394 b/tests/data/test394 index 3a51d5a9c5..c3cbc691eb 100644 --- a/tests/data/test394 +++ b/tests/data/test394 @@ -4,7 +4,6 @@ HTTP HTTP GET -FAILURE diff --git a/tests/data/test402 b/tests/data/test402 index 5226d6c731..ab036b27d6 100644 --- a/tests/data/test402 +++ b/tests/data/test402 @@ -4,7 +4,6 @@ FTP FTPS -FAILURE diff --git a/tests/data/test403 b/tests/data/test403 index bbf162d22c..6bf16a6230 100644 --- a/tests/data/test403 +++ b/tests/data/test403 @@ -7,7 +7,6 @@ FTPS PASV LIST CCC -FAILURE # Server-side diff --git a/tests/data/test404 b/tests/data/test404 index 96f3eaa9c0..1e69b881f7 100644 --- a/tests/data/test404 +++ b/tests/data/test404 @@ -4,7 +4,6 @@ FTP FTPS -FAILURE diff --git a/tests/data/test405 b/tests/data/test405 index 73a6dcf430..e67dcf16d4 100644 --- a/tests/data/test405 +++ b/tests/data/test405 @@ -4,7 +4,6 @@ FTP FTPS -FAILURE diff --git a/tests/data/test409 b/tests/data/test409 deleted file mode 100644 index 5660b5d6ca..0000000000 --- a/tests/data/test409 +++ /dev/null @@ -1,58 +0,0 @@ - - - - -FTP -FTPS -EPSV -STOR - - - -# Client-side - - -SSL - - -ftps - - -FTPS PASV upload file - - -data - to - see -that FTP -works - so does it? - - ---insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt - - - -# Verify data after the test has been "shot" - - -data - to - see -that FTP -works - so does it? - - -USER anonymous -PASS ftp@example.com -PBSZ 0 -PROT C -PWD -EPSV -TYPE I -STOR %TESTNUMBER -QUIT - - - diff --git a/tests/data/test41 b/tests/data/test41 index efeb58ec9b..0259f25bb9 100644 --- a/tests/data/test41 +++ b/tests/data/test41 @@ -4,7 +4,6 @@ HTTP HTTP FORMPOST -FAILURE # Server-side diff --git a/tests/data/test419 b/tests/data/test419 index 51c5a16a08..04a6a63d9f 100644 --- a/tests/data/test419 +++ b/tests/data/test419 @@ -3,7 +3,6 @@ --dump-header -FAILURE diff --git a/tests/data/test472 b/tests/data/test472 index dd426b9cec..f2e96717f7 100644 --- a/tests/data/test472 +++ b/tests/data/test472 @@ -36,7 +36,7 @@ Unicode aws -aws-sigv4 with query +aws-sigv4 with query using unicode "http://fake.fake.fake:8000/%TESTNUMBER/a=%hex[%e3%81%82]hex%" -u user:secret --aws-sigv4 "aws:amz:us-east-2:es" --connect-to fake.fake.fake:8000:%HOSTIP:%HTTPPORT diff --git a/tests/data/test504 b/tests/data/test504 index 457dfb6d38..c4670ee1b1 100644 --- a/tests/data/test504 +++ b/tests/data/test504 @@ -6,7 +6,6 @@ HTTP HTTP GET HTTP proxy multi -FAILURE connect to non-listen diff --git a/tests/data/test507 b/tests/data/test507 index c06743f30c..5915ef7042 100644 --- a/tests/data/test507 +++ b/tests/data/test507 @@ -4,7 +4,6 @@ HTTP multi -FAILURE non-existing host diff --git a/tests/data/test527 b/tests/data/test527 deleted file mode 100644 index bcc0d87818..0000000000 --- a/tests/data/test527 +++ /dev/null @@ -1,64 +0,0 @@ - - - - -FTP -PASV -RETR -multi - - - -# Server-side - - -file contents should appear once for each file - - -file contents should appear once for each file -file contents should appear once for each file -file contents should appear once for each file -file contents should appear once for each file - - - -# Client-side - - -ftp - - -lib526 - - -FTP RETR same file using different handles but same connection - - -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER - - - -# Verify data after the test has been "shot" - - -USER anonymous -PASS ftp@example.com -PWD -CWD path -EPSV -TYPE I -SIZE %TESTNUMBER -RETR %TESTNUMBER -EPSV -SIZE %TESTNUMBER -RETR %TESTNUMBER -EPSV -SIZE %TESTNUMBER -RETR %TESTNUMBER -EPSV -SIZE %TESTNUMBER -RETR %TESTNUMBER -QUIT - - - diff --git a/tests/data/test538 b/tests/data/test538 index 2ee171b5b1..69e6fa931c 100644 --- a/tests/data/test538 +++ b/tests/data/test538 @@ -3,7 +3,6 @@ FTP -FAILURE multi diff --git a/tests/data/test594 b/tests/data/test594 index 98db071f26..aaa007cbde 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -12,7 +12,6 @@ multi EPRT refused NODATACONN timeout -FAILURE diff --git a/tests/data/test604 b/tests/data/test604 index e6d6371945..c901cb6fbf 100644 --- a/tests/data/test604 +++ b/tests/data/test604 @@ -3,7 +3,6 @@ SFTP -FAILURE diff --git a/tests/data/test605 b/tests/data/test605 index ea7af94af4..ba708afeff 100644 --- a/tests/data/test605 +++ b/tests/data/test605 @@ -3,7 +3,6 @@ SCP -FAILURE diff --git a/tests/data/test606 b/tests/data/test606 index 48286e63e6..95e9f3d6b3 100644 --- a/tests/data/test606 +++ b/tests/data/test606 @@ -3,7 +3,6 @@ SFTP -FAILURE diff --git a/tests/data/test607 b/tests/data/test607 index 92ffe48e55..960cb0b2aa 100644 --- a/tests/data/test607 +++ b/tests/data/test607 @@ -3,7 +3,6 @@ SCP -FAILURE diff --git a/tests/data/test609 b/tests/data/test609 index efd8496f32..c5c7335f73 100644 --- a/tests/data/test609 +++ b/tests/data/test609 @@ -4,7 +4,6 @@ SFTP post-quote -FAILURE diff --git a/tests/data/test611 b/tests/data/test611 deleted file mode 100644 index c64d5ba94d..0000000000 --- a/tests/data/test611 +++ /dev/null @@ -1,42 +0,0 @@ - - - - -SFTP -post-quote - - - -# Server-side - - -Dummy test file for rename test - - - -# Client-side - - -sftp - - -%PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir - - -SFTP post-quote rename - - ---key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %SFTP_PWD/%LOGDIR/test%TESTNUMBER.dir %SFTP_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - - -Dummy test file for rename test - - - -# Verify data after the test has been "shot" - - -%PERL %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new - - - diff --git a/tests/data/test615 b/tests/data/test615 index 82307392ba..8e2a6760b7 100644 --- a/tests/data/test615 +++ b/tests/data/test615 @@ -4,7 +4,6 @@ SFTP SFTP put -FAILURE diff --git a/tests/data/test620 b/tests/data/test620 index 0136b6e2bc..8ed5784e2d 100644 --- a/tests/data/test620 +++ b/tests/data/test620 @@ -3,7 +3,6 @@ SFTP -FAILURE diff --git a/tests/data/test621 b/tests/data/test621 index 33290e9953..d15974cbd6 100644 --- a/tests/data/test621 +++ b/tests/data/test621 @@ -3,7 +3,6 @@ SCP -FAILURE diff --git a/tests/data/test622 b/tests/data/test622 index 97d0075b97..33a73dee03 100644 --- a/tests/data/test622 +++ b/tests/data/test622 @@ -4,7 +4,6 @@ SFTP SFTP put -FAILURE diff --git a/tests/data/test623 b/tests/data/test623 index 94f0ddc55b..cbafe3811e 100644 --- a/tests/data/test623 +++ b/tests/data/test623 @@ -4,7 +4,6 @@ SCP SCP upload -FAILURE diff --git a/tests/data/test626 b/tests/data/test626 index 3ded7bf874..2ec6f5d48b 100644 --- a/tests/data/test626 +++ b/tests/data/test626 @@ -4,7 +4,6 @@ SFTP pre-quote -FAILURE diff --git a/tests/data/test628 b/tests/data/test628 index 5394d00c6d..c343108e2d 100644 --- a/tests/data/test628 +++ b/tests/data/test628 @@ -3,7 +3,6 @@ SFTP -FAILURE diff --git a/tests/data/test629 b/tests/data/test629 index 0c9e32ae94..2869517e8f 100644 --- a/tests/data/test629 +++ b/tests/data/test629 @@ -3,7 +3,6 @@ SCP -FAILURE diff --git a/tests/data/test630 b/tests/data/test630 index 8d5c1f8e29..e5e2fd8fa4 100644 --- a/tests/data/test630 +++ b/tests/data/test630 @@ -3,7 +3,6 @@ SFTP -FAILURE server key check diff --git a/tests/data/test631 b/tests/data/test631 index 33e7fff9b5..813c008e55 100644 --- a/tests/data/test631 +++ b/tests/data/test631 @@ -3,7 +3,6 @@ SCP -FAILURE server key check diff --git a/tests/data/test632 b/tests/data/test632 index 0520bcea0b..1c67dff5d8 100644 --- a/tests/data/test632 +++ b/tests/data/test632 @@ -3,7 +3,6 @@ SFTP -FAILURE server key check diff --git a/tests/data/test639 b/tests/data/test639 index e87b2c931d..529e70515a 100644 --- a/tests/data/test639 +++ b/tests/data/test639 @@ -25,7 +25,7 @@ sftp %PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir -SFTP post-quote rename * asterisk accept-fail +SFTP post-quote rename error with accept-fail --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %SFTP_PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %SFTP_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test656 b/tests/data/test656 index 8f586b739d..4e1599bacc 100644 --- a/tests/data/test656 +++ b/tests/data/test656 @@ -3,7 +3,6 @@ SFTP -FAILURE diff --git a/tests/data/test688 b/tests/data/test688 index 9de1bab933..44f621e33c 100644 --- a/tests/data/test688 +++ b/tests/data/test688 @@ -36,7 +36,7 @@ xattr CURL_FAKE_XATTR=1 -basic --xattr with -O +basic --xattr with (uppercase) -O --xattr -O --output-dir %LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test702 b/tests/data/test702 index 7b899884c5..ea565d4be5 100644 --- a/tests/data/test702 +++ b/tests/data/test702 @@ -6,7 +6,6 @@ HTTP SOCKS4 connect to non-listen -FAILURE # Server-side diff --git a/tests/data/test703 b/tests/data/test703 index e3ce17e142..197b0da2b4 100644 --- a/tests/data/test703 +++ b/tests/data/test703 @@ -6,7 +6,6 @@ HTTP SOCKS5 connect to non-listen -FAILURE # Server-side diff --git a/tests/data/test704 b/tests/data/test704 index 0decb7cddf..5ef11ea6f0 100644 --- a/tests/data/test704 +++ b/tests/data/test704 @@ -6,7 +6,6 @@ HTTP SOCKS4 connect to non-listen -FAILURE # Server-side diff --git a/tests/data/test705 b/tests/data/test705 index b2d1642ba9..c86289be67 100644 --- a/tests/data/test705 +++ b/tests/data/test705 @@ -6,7 +6,6 @@ HTTP SOCKS5 connect to non-listen -FAILURE # Server-side diff --git a/tests/data/test708 b/tests/data/test708 index 8c52751423..e96900b52b 100644 --- a/tests/data/test708 +++ b/tests/data/test708 @@ -39,7 +39,7 @@ socks4 all_proxy=socks4://%HOSTIP:%SOCKSPORT -HTTP GET via SOCKS4 proxy +HTTP GET via SOCKS4 all_proxy http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test75 b/tests/data/test75 index 0ba5e782c5..b76cefbf77 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -5,7 +5,6 @@ HTTP HTTP GET globbing -FAILURE # Server-side diff --git a/tests/data/test758 b/tests/data/test758 index df39300fe2..08f024fecd 100644 --- a/tests/data/test758 +++ b/tests/data/test758 @@ -39,7 +39,7 @@ https lib%TESTNUMBER -multi_socket interface transfer with callbacks returning error +HTTPS multi_socket interface transfer with callbacks returning error https://localhost:%HTTPSPORT/file%TESTNUMBER diff --git a/tests/data/test800 b/tests/data/test800 index 512f9bbcae..2c4d97088e 100644 --- a/tests/data/test800 +++ b/tests/data/test800 @@ -27,7 +27,7 @@ body imap -IMAP FETCH message +IMAP FETCH message with MAILINDEX 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' diff --git a/tests/data/test803 b/tests/data/test803 index 20f84f83d7..6c4c67697c 100644 --- a/tests/data/test803 +++ b/tests/data/test803 @@ -6,7 +6,6 @@ IMAP Clear Text SELECT UIDVALIDITY -FAILURE diff --git a/tests/data/test847 b/tests/data/test847 index e175ba1062..8ee2a22b38 100644 --- a/tests/data/test847 +++ b/tests/data/test847 @@ -27,7 +27,7 @@ body imap -IMAP FETCH message +IMAP FETCH message with UID 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=1' -u '"user:sec"ret{' diff --git a/tests/data/test852 b/tests/data/test852 index 43779dcdc8..64e2ad33ad 100644 --- a/tests/data/test852 +++ b/tests/data/test852 @@ -5,7 +5,6 @@ POP3 Clear Text LIST -FAILURE diff --git a/tests/data/test855 b/tests/data/test855 index 966eeaa822..3e01b32216 100644 --- a/tests/data/test855 +++ b/tests/data/test855 @@ -5,7 +5,6 @@ POP3 Clear Text RETR -FAILURE diff --git a/tests/data/test856 b/tests/data/test856 index 1bd8074193..cf8602b5ae 100644 --- a/tests/data/test856 +++ b/tests/data/test856 @@ -4,7 +4,6 @@ POP3 Clear Text -FAILURE diff --git a/tests/data/test87 b/tests/data/test87 index 620ae38488..8477513f0a 100644 --- a/tests/data/test87 +++ b/tests/data/test87 @@ -6,7 +6,6 @@ HTTP HTTP GET globbing [] range -FAILURE # Server-side diff --git a/tests/data/test94 b/tests/data/test94 index bca0a8e1cc..30c370ef9f 100644 --- a/tests/data/test94 +++ b/tests/data/test94 @@ -6,7 +6,6 @@ HTTPS HTTP GET HTTP CONNECT HTTP proxy -FAILURE # Server-side diff --git a/tests/data/test962 b/tests/data/test962 index 07bb95905c..a3fb2c99a8 100644 --- a/tests/data/test962 +++ b/tests/data/test962 @@ -25,7 +25,7 @@ codeset-utf8 LC_ALL=C.UTF-8 -SMTP without SMTPUTF8 support - UTF-8 based sender (host part only) +SMTP without SMTPUTF8 support - UTF-8 based sender, with IDN From: different diff --git a/tests/data/test99 b/tests/data/test99 index 6a4f276774..4582eba406 100644 --- a/tests/data/test99 +++ b/tests/data/test99 @@ -6,7 +6,6 @@ HTTP HTTP GET Resume Largefile -FAILURE # Server-side