From f94fcdba6eae7c2f14cb207fc6008bdc79a86d62 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 15 Jun 2017 23:47:42 +0200 Subject: tests: stabilize test 2032 and 2033 Both these tests run the same underlying test code: libntlmconnect.c - this test code made some assumptions about socket ordering when it used curl_easy_fdset() and when we changed timing or got accidental changes in libcurl the tests would fail. The tests verify that the different transfers keep using the same connections, which I now instead made sure by adding the number of bytes each transfer gets and then verifies that they always get the same amount as when these tests worked. Closes #1576 --- tests/data/test2033 | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'tests/data/test2033') diff --git a/tests/data/test2033 b/tests/data/test2033 index e2307d062..405d12a27 100644 --- a/tests/data/test2033 +++ b/tests/data/test2033 @@ -6,7 +6,6 @@ HTTP GET HTTP Basic auth HTTP NTLM auth pipelining -flaky # Server-side @@ -56,34 +55,9 @@ Finally, this is the real page! -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! -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! -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 TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg= - -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! +Data connection 0: 228 +Data connection 1: 228 +Data connection 2: 402 -- cgit v1.2.3