aboutsummaryrefslogtreecommitdiff
path: root/tests/data
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-06-15 23:47:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-06-16 11:43:26 +0200
commitf94fcdba6eae7c2f14cb207fc6008bdc79a86d62 (patch)
tree99e8836eb7d5d0ec2b16d16103a33358844a874b /tests/data
parentde4c747544ebcaa0d5358418eb4a47879a15ccd4 (diff)
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
Diffstat (limited to 'tests/data')
-rw-r--r--tests/data/test203232
-rw-r--r--tests/data/test203332
2 files changed, 6 insertions, 58 deletions
diff --git a/tests/data/test2032 b/tests/data/test2032
index cd1395f2c..8776c3b00 100644
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -5,7 +5,6 @@ HTTP
HTTP GET
HTTP Basic auth
HTTP NTLM auth
-flaky
</keywords>
</info>
# Server-side
@@ -55,34 +54,9 @@ Finally, this is the real page!
</data1202>
<datacheck>
-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
</datacheck>
</reply>
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
</keywords>
</info>
# Server-side
@@ -56,34 +55,9 @@ Finally, this is the real page!
</data1202>
<datacheck>
-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
</datacheck>
</reply>