diff options
| -rw-r--r-- | tests/data/DISABLED | 33 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 8 | ||||
| -rw-r--r-- | tests/data/test1900 | 61 | ||||
| -rw-r--r-- | tests/data/test1901 | 63 | ||||
| -rw-r--r-- | tests/data/test1902 | 62 | ||||
| -rw-r--r-- | tests/data/test1903 | 62 | ||||
| -rw-r--r-- | tests/data/test2033 | 125 | ||||
| -rw-r--r-- | tests/data/test530 | 83 | ||||
| -rw-r--r-- | tests/data/test584 | 102 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 6 |
10 files changed, 18 insertions, 587 deletions
diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 198728fdf..1806a5dbe 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -2,31 +2,24 @@ # test cases are run by runtests.pl. Just add the plain test case numbers, one # per line. # Lines starting with '#' letters are treated as comments. +# +# Uses SRP to "a server not supporting it" but modern stunnel versions +# will silently accept it and remain happy +323 +# 594 +836 +882 +938 1209 1211 +# fnmatch differences are just too common to make testing them sensible +1307 1316 +# test 1510 causes problems on the CI on github +# example: https://travis-ci.org/curl/curl/builds/81633600 +1510 1512 -836 -882 -938 # test 1801 causes problems on Mac OS X and github # https://github.com/curl/curl/issues/380 1801 -# test 1510 causes problems on the CI on github -# example: https://travis-ci.org/curl/curl/builds/81633600 -1510 -# Pipelining test that is causing false positives a little too often -1903 -# fnmatch differences are just too common to make testing them sensible -1307 -# Pipelining is deprecated -530 -584 -1900 -1901 -1902 -2033 -# Uses SRP to "a server not supporting it" but modern stunnel versions -# will silently accept it and remain happy -323 diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index bc6dea9f8..8a334df10 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -73,13 +73,13 @@ test490 test491 test492 \ 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 test528 test529 test530 test531 test532 test533 test534 test535 \ +test527 test528 test529 test531 test532 test533 test534 test535 \ test537 test538 test539 test540 test541 test542 test543 test544 \ test545 test546 test547 test548 test549 test550 test551 test552 test553 \ test554 test555 test556 test557 test558 test559 test560 test561 test562 \ test563 test564 test565 test566 test567 test568 test569 test570 test571 \ test572 test573 test574 test575 test576 test577 test578 test579 test580 \ -test581 test582 test583 test584 test585 test586 test587 test588 test589 \ +test581 test582 test583 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 \ @@ -206,14 +206,14 @@ test1700 test1701 test1702 \ \ test1800 test1801 \ \ -test1900 test1901 test1902 test1903 test1904 test1905 test1906 test1907 \ + test1904 test1905 test1906 test1907 \ test1908 test1909 test1910 test1911 \ \ test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \ test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \ test2016 test2017 test2018 test2019 test2020 test2021 test2022 test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ -test2032 test2033 test2034 test2035 test2036 test2037 test2038 test2039 \ +test2032 test2034 test2035 test2036 test2037 test2038 test2039 \ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \ test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \ diff --git a/tests/data/test1900 b/tests/data/test1900 deleted file mode 100644 index 2e3c93a0d..000000000 --- a/tests/data/test1900 +++ /dev/null @@ -1,61 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -</keywords> -</info> - -# Server-side -<reply> -<data> -Adding handle 0 -Handle 0 Completed with status 0 -Adding handle 1 -Adding handle 2 -Adding handle 3 -Adding handle 4 -Adding handle 5 -Adding handle 6 -Handle 4 Completed with status 0 -Handle 5 Completed with status 0 -Handle 6 Completed with status 0 -Handle 1 Completed with status 0 -Handle 2 Completed with status 0 -Handle 3 Completed with status 0 -</data> -</reply> - -# Client-side -<client> -<server> -http-pipe -</server> -<features> -http -</features> -<tool> -lib1900 -</tool> - <name> -HTTP GET using pipelining - </name> - <command> -http://%HOSTIP:%HTTPPIPEPORT/ log/urls1900.txt -</command> -<file name="log/urls1900.txt"> -0 1k.txt -1000 100k.txt -0 1k.txt -0 1k.txt -0 1k.txt -0 1k.txt -0 1k.txt -</file> -</client> - -# Verify data after the test has been "shot" -<verify> -</verify> -</testcase> diff --git a/tests/data/test1901 b/tests/data/test1901 deleted file mode 100644 index 793bd667a..000000000 --- a/tests/data/test1901 +++ /dev/null @@ -1,63 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -flaky -</keywords> -</info> - -# Server-side -<reply> -<data> -Adding handle 0 -Handle 0 Completed with status 0 -Adding handle 1 -Adding handle 2 -Adding handle 3 -Adding handle 4 -Adding handle 5 -Adding handle 6 -Handle 2 Completed with status 0 -Handle 3 Completed with status 0 -Handle 4 Completed with status 0 -Handle 1 Completed with status 0 -Handle 5 Completed with status 0 -Handle 6 Completed with status 0 -</data> -</reply> - -# Client-side -<client> -<server> -http-pipe -</server> -<features> -http -</features> -<tool> -lib1900 -</tool> - <name> -HTTP GET using pipelining, blocklisted site - </name> - <command> -http://%HOSTIP:%HTTPPIPEPORT/ log/urls1901.txt -</command> -<file name="log/urls1901.txt"> -blocklist_site 127.0.0.1:%HTTPPIPEPORT -0 1k.txt -1000 100k.txt -0 1k.txt -0 1k.txt -0 1k.txt -0 1k.txt -0 1k.txt -</file> -</client> - -# Verify data after the test has been "shot" -<verify> -</verify> -</testcase> diff --git a/tests/data/test1902 b/tests/data/test1902 deleted file mode 100644 index 3c999316b..000000000 --- a/tests/data/test1902 +++ /dev/null @@ -1,62 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -flaky -</keywords> -</info> - -# Server-side -<reply> -<data> -Adding handle 0 -Handle 0 Completed with status 0 -Adding handle 1 -Adding handle 2 -Adding handle 3 -Adding handle 4 -Adding handle 5 -Adding handle 6 -Handle 1 Completed with status 0 -Handle 4 Completed with status 0 -Handle 5 Completed with status 0 -Handle 6 Completed with status 0 -Handle 2 Completed with status 0 -Handle 3 Completed with status 0 -</data> -</reply> - -# Client-side -<client> -<server> -http-pipe -</server> -<features> -http -</features> -<tool> -lib1900 -</tool> - <name> -HTTP GET using pipelining, broken pipe - </name> - <command> -http://%HOSTIP:%HTTPPIPEPORT/ log/urls1902.txt -</command> -<file name="log/urls1902.txt"> -0 1k.txt -1000 connection_close.txt -1 1k.txt -2 1k.txt -3 1k.txt -4 1k.txt -5 1k.txt -</file> -</client> - -# Verify data after the test has been "shot" -<verify> -</verify> -</testcase> diff --git a/tests/data/test1903 b/tests/data/test1903 deleted file mode 100644 index 219ffe11c..000000000 --- a/tests/data/test1903 +++ /dev/null @@ -1,62 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -flaky -</keywords> -</info> - -# Server-side -<reply> -<data> -Adding handle 0 -Handle 0 Completed with status 0 -Adding handle 1 -Adding handle 2 -Adding handle 3 -Adding handle 4 -Adding handle 5 -Adding handle 6 -Handle 2 Completed with status 0 -Handle 3 Completed with status 0 -Handle 4 Completed with status 0 -Handle 5 Completed with status 0 -Handle 6 Completed with status 0 -Handle 1 Completed with status 0 -</data> -</reply> - -# Client-side -<client> -<server> -http-pipe -</server> -<features> -http -</features> -<tool> -lib1900 -</tool> - <name> -HTTP GET using pipelining, penalized on content-length - </name> - <command> -http://%HOSTIP:%HTTPPIPEPORT/ log/urls1903.txt -</command> -<file name="log/urls1903.txt"> -0 1k.txt -1000 100k.txt -550 alphabet.txt -10 alphabet.txt -10 alphabet.txt -10 alphabet.txt -10 alphabet.txt -</file> -</client> - -# Verify data after the test has been "shot" -<verify> -</verify> -</testcase> diff --git a/tests/data/test2033 b/tests/data/test2033 deleted file mode 100644 index 0b33ccaac..000000000 --- a/tests/data/test2033 +++ /dev/null @@ -1,125 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -HTTP GET -HTTP Basic auth -HTTP NTLM auth -pipelining -flaky -</keywords> -</info> -# Server-side -<reply> - -<!-- Basic auth --> -<data100> -HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
-This is a bad password page! -</data100> - -<!-- NTLM auth --> -<data200> -HTTP/1.1 401 Need Basic or NTLM auth (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 27
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
-This is not the real page! -</data200> - -<data1201> -HTTP/1.1 401 NTLM intermediate (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 33
-WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-This is still not the real page! -</data1201> - -<data1202> -HTTP/1.1 200 Things are fine in server land
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 32
-
-Finally, this is the real page! -</data1202> - -<datacheck> -Data connection 0: 228 -Data connection 1: 228 -Data connection 2: 402 -</datacheck> - -</reply> - -# Client-side -<client> -<features> -NTLM -SSL -!SSPI -</features> -<server> -http -</server> -<tool> -lib2033 -</tool> - - <name> -NTLM connection mapping, pipelining enabled - </name> - <setenv> -# we force our own host name, in order to make the test machine independent -CURL_GETHOSTNAME=curlhost -# we try to use the LD_PRELOAD hack, if not a debug build -LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - </setenv> - <command> -http://%HOSTIP:%HTTPPORT/2032 -</command> -<precheck> -chkhostname curlhost -</precheck> -</client> - -# Verify data after the test has been "shot" -<verify> -<strip> -^User-Agent:.* -</strip> -<protocol> -GET /20320100 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
-Accept: */*
-
-GET /20320100 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
-Accept: */*
-
-GET /20320200 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-Accept: */*
-
-GET /20320200 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
-Accept: */*
-
-</protocol> -</verify> -</testcase> diff --git a/tests/data/test530 b/tests/data/test530 deleted file mode 100644 index 40182e299..000000000 --- a/tests/data/test530 +++ /dev/null @@ -1,83 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -</keywords> -</info> - -# Server-side -<reply> -<data1> -HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
-file contents should appear once for each file -</data1> -<data2> -HTTP/1.1 200 OK
-</data2> -<data3> -Date: Thu, 09 Nov 2010 14:49:00 GMT
-</data3> -<data4> -Server: test-server/fake
-Content-Length: 47
-
-file contents should appear once for each file -HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
-file contents should appear once for each file -HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
-file contents should appear once for each file -</data4> -</reply> - -# Client-side -<client> -<server> -http -</server> -<tool> -lib530 -</tool> - <name> -HTTP GET using pipelining - </name> - <command> -http://%HOSTIP:%HTTPPORT/path/530 -</command> -</client> - -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /path/5300001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5300002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5300003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5300004 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-</protocol> -</verify> -</testcase> diff --git a/tests/data/test584 b/tests/data/test584 deleted file mode 100644 index 309c7b65b..000000000 --- a/tests/data/test584 +++ /dev/null @@ -1,102 +0,0 @@ -<testcase> -<info> -<keywords> -HTTP -pipelining -multi -</keywords> -</info> - -# Server-side -# Silly division of the first request is solely to appease the server which expects n_data_items == n_requests -<reply> -<data1> -HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
-584 -</data1> -<data2> -HTTP/1.1 200 OK
-</data2> -<data3> -Server: test-server/fake
-</data3> -<data4> -Content-Length: 0
-
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 5
-
-585 - -HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
-586 -</data4> -</reply> - -# Client-side -<client> -<server> -http -</server> -<tool> -lib530 -</tool> - <name> -HTTP GET using pipelining (nonzero length after zero length) - </name> - <command> -http://%HOSTIP:%HTTPPORT/path/584 -</command> -</client> - -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /path/5840001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5840002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5840003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-GET /path/5840004 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
-</protocol> -<stdout> -HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
-584 -HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 0
-
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 5
-
-585 - -HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
-586 -</stdout> -</verify> -</testcase> diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index c568e1354..dc2008fa8 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -39,7 +39,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ chkdecimalpoint \ lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 lib508 lib509 \ lib510 lib511 lib512 lib513 lib514 lib515 lib516 lib517 lib518 lib519 \ - lib520 lib521 lib523 lib524 lib525 lib526 lib527 lib529 lib530 lib532 \ + lib520 lib521 lib523 lib524 lib525 lib526 lib527 lib529 lib532 \ lib533 lib537 lib539 lib540 lib541 lib542 lib543 lib544 lib545 \ lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 lib557 lib558 \ lib559 lib560 lib562 lib564 lib565 lib566 lib567 lib568 lib569 lib570 \ @@ -172,10 +172,6 @@ lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib529_LDADD = $(TESTUTIL_LIBS) lib529_CPPFLAGS = $(AM_CPPFLAGS) -DLIB529 -lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib530_LDADD = $(TESTUTIL_LIBS) -lib530_CPPFLAGS = $(AM_CPPFLAGS) -DLIB530 - lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib532_LDADD = $(TESTUTIL_LIBS) lib532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB532 |