From 9603c8299f135cb670261d0af58825274d0dfdae Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Sun, 29 Dec 2019 15:23:25 -0500 Subject: tests: Change NTLM tests to require SSL Prior to this change tests that required NTLM feature did not require SSL feature. There are pending changes to cmake builds that will allow enabling NTLM in non-SSL builds in Windows. In that case the NTLM auth strings created are different from what is expected by the NTLM tests and they fail: "The issue with NTLM is that previous non-SSL builds would not enable NTLM and so the NTLM tests would be skipped." Assisted-by: marc-groundctl@users.noreply.github.com Ref: https://github.com/curl/curl/pull/4717#issuecomment-566218729 Closes https://github.com/curl/curl/pull/4768 --- tests/data/test1008 | 1 + tests/data/test1021 | 1 + tests/data/test1097 | 1 + tests/data/test1100 | 1 + tests/data/test1215 | 1 + tests/data/test150 | 1 + tests/data/test155 | 1 + tests/data/test159 | 1 + tests/data/test162 | 1 + tests/data/test169 | 1 + tests/data/test170 | 1 + tests/data/test176 | 1 + tests/data/test2025 | 1 + tests/data/test2028 | 1 + tests/data/test2029 | 1 + tests/data/test2030 | 1 + tests/data/test2031 | 1 + tests/data/test2032 | 1 + tests/data/test2033 | 1 + tests/data/test209 | 1 + tests/data/test213 | 1 + tests/data/test239 | 1 + tests/data/test243 | 1 + tests/data/test265 | 1 + tests/data/test267 | 1 + tests/data/test547 | 1 + tests/data/test548 | 1 + tests/data/test555 | 1 + tests/data/test590 | 1 + tests/data/test67 | 1 + tests/data/test68 | 1 + tests/data/test69 | 1 + tests/data/test81 | 1 + tests/data/test822 | 1 + tests/data/test827 | 1 + tests/data/test831 | 1 + tests/data/test834 | 1 + tests/data/test868 | 1 + tests/data/test873 | 1 + tests/data/test877 | 1 + tests/data/test880 | 1 + tests/data/test89 | 1 + tests/data/test90 | 1 + tests/data/test906 | 1 + tests/data/test91 | 1 + tests/data/test921 | 1 + tests/data/test933 | 1 + tests/data/test936 | 1 + 48 files changed, 48 insertions(+) (limited to 'tests') diff --git a/tests/data/test1008 b/tests/data/test1008 index 9fca722c8..a1ef0dd7a 100644 --- a/tests/data/test1008 +++ b/tests/data/test1008 @@ -86,6 +86,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test1021 b/tests/data/test1021 index 689341d60..84d1e62a7 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -91,6 +91,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test1097 b/tests/data/test1097 index 7eb7b5f3d..70a89908d 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -45,6 +45,7 @@ https NTLM +SSL !SSPI diff --git a/tests/data/test1100 b/tests/data/test1100 index d60a93a77..101b1e7ac 100644 --- a/tests/data/test1100 +++ b/tests/data/test1100 @@ -63,6 +63,7 @@ This is the final page ! NTLM +SSL !SSPI debug diff --git a/tests/data/test1215 b/tests/data/test1215 index 8edfd9b4e..ed50da0b8 100644 --- a/tests/data/test1215 +++ b/tests/data/test1215 @@ -58,6 +58,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test150 b/tests/data/test150 index f28be0464..e9fde393b 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -57,6 +57,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test155 b/tests/data/test155 index 0a2bb0fa2..0cfd10eea 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -76,6 +76,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test159 b/tests/data/test159 index 5a062176e..a56986fba 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -43,6 +43,7 @@ This is not the real page either! NTLM +SSL !SSPI debug diff --git a/tests/data/test162 b/tests/data/test162 index 099641a87..29791d9af 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -27,6 +27,7 @@ isn't because there's no Proxy-Authorization: NTLM header NTLM +SSL !SSPI proxy diff --git a/tests/data/test169 b/tests/data/test169 index 8013bcc17..209dd9d90 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test170 b/tests/data/test170 index 49d595bbc..9b41ddd7f 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -19,6 +19,7 @@ http NTLM +SSL !SSPI proxy diff --git a/tests/data/test176 b/tests/data/test176 index 73c53ca87..e18837af1 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -48,6 +48,7 @@ content for you NTLM +SSL !SSPI diff --git a/tests/data/test2025 b/tests/data/test2025 index 6dfc70a7d..282c69850 100644 --- a/tests/data/test2025 +++ b/tests/data/test2025 @@ -195,6 +195,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2028 b/tests/data/test2028 index 2042eecf1..92a637161 100644 --- a/tests/data/test2028 +++ b/tests/data/test2028 @@ -231,6 +231,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2029 b/tests/data/test2029 index 82d80857b..59a793ebe 100644 --- a/tests/data/test2029 +++ b/tests/data/test2029 @@ -168,6 +168,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2030 b/tests/data/test2030 index 893f986f7..a158a907a 100644 --- a/tests/data/test2030 +++ b/tests/data/test2030 @@ -220,6 +220,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2031 b/tests/data/test2031 index 979962134..9acfeef72 100644 --- a/tests/data/test2031 +++ b/tests/data/test2031 @@ -234,6 +234,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2032 b/tests/data/test2032 index ec5771f81..8200b8de5 100644 --- a/tests/data/test2032 +++ b/tests/data/test2032 @@ -66,6 +66,7 @@ Data connection 2: 402 NTLM +SSL !SSPI diff --git a/tests/data/test2033 b/tests/data/test2033 index a13c1d425..5293b66e8 100644 --- a/tests/data/test2033 +++ b/tests/data/test2033 @@ -67,6 +67,7 @@ Data connection 2: 402 NTLM +SSL !SSPI diff --git a/tests/data/test209 b/tests/data/test209 index aded6d2d2..67a7fc513 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test213 b/tests/data/test213 index 82d82c483..e6d7cd55a 100644 --- a/tests/data/test213 +++ b/tests/data/test213 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test239 b/tests/data/test239 index a6f1fd59b..b6f387933 100644 --- a/tests/data/test239 +++ b/tests/data/test239 @@ -52,6 +52,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test243 b/tests/data/test243 index f83218e14..f7b2386b5 100644 --- a/tests/data/test243 +++ b/tests/data/test243 @@ -73,6 +73,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test265 b/tests/data/test265 index ff7d5945e..a27633afc 100644 --- a/tests/data/test265 +++ b/tests/data/test265 @@ -78,6 +78,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test267 b/tests/data/test267 index 06b662c91..a0c3d33c6 100644 --- a/tests/data/test267 +++ b/tests/data/test267 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test547 b/tests/data/test547 index 781799b11..e4ec39893 100644 --- a/tests/data/test547 +++ b/tests/data/test547 @@ -76,6 +76,7 @@ lib547 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test548 b/tests/data/test548 index fa98cd437..d636ab1b6 100644 --- a/tests/data/test548 +++ b/tests/data/test548 @@ -76,6 +76,7 @@ lib548 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test555 b/tests/data/test555 index d4b946614..ed8117f8f 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -81,6 +81,7 @@ lib555 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test590 b/tests/data/test590 index 6f6250763..5ddc823a5 100644 --- a/tests/data/test590 +++ b/tests/data/test590 @@ -74,6 +74,7 @@ lib590 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test67 b/tests/data/test67 index 1c64a2f51..c0ccaf8f8 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test68 b/tests/data/test68 index 91d16ade6..1eaff6e7d 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -55,6 +55,7 @@ Wrong password dude. Get it fixed and return. NTLM +SSL !SSPI debug diff --git a/tests/data/test69 b/tests/data/test69 index 7af662f6e..309f0394a 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -72,6 +72,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test81 b/tests/data/test81 index 4cc03975e..29e558d9c 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -55,6 +55,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test822 b/tests/data/test822 index 5fea05ba8..aa264edd6 100644 --- a/tests/data/test822 +++ b/tests/data/test822 @@ -35,6 +35,7 @@ imap NTLM +SSL !SSPI debug diff --git a/tests/data/test827 b/tests/data/test827 index d27112112..9cefb5005 100644 --- a/tests/data/test827 +++ b/tests/data/test827 @@ -36,6 +36,7 @@ imap NTLM +SSL !SSPI debug diff --git a/tests/data/test831 b/tests/data/test831 index fdcae29c1..eae10f048 100644 --- a/tests/data/test831 +++ b/tests/data/test831 @@ -28,6 +28,7 @@ imap NTLM +SSL !SSPI diff --git a/tests/data/test834 b/tests/data/test834 index 35ab06aff..8ecc22322 100644 --- a/tests/data/test834 +++ b/tests/data/test834 @@ -39,6 +39,7 @@ imap NTLM +SSL !SSPI diff --git a/tests/data/test868 b/tests/data/test868 index fc0589251..2fa2405ad 100644 --- a/tests/data/test868 +++ b/tests/data/test868 @@ -37,6 +37,7 @@ pop3 NTLM +SSL !SSPI debug diff --git a/tests/data/test873 b/tests/data/test873 index 9c068dcb4..2cabf1f63 100644 --- a/tests/data/test873 +++ b/tests/data/test873 @@ -37,6 +37,7 @@ pop3 NTLM +SSL !SSPI debug diff --git a/tests/data/test877 b/tests/data/test877 index c4775942f..114707aad 100644 --- a/tests/data/test877 +++ b/tests/data/test877 @@ -29,6 +29,7 @@ pop3 NTLM +SSL !SSPI diff --git a/tests/data/test880 b/tests/data/test880 index 738817cd3..e0609bbdc 100644 --- a/tests/data/test880 +++ b/tests/data/test880 @@ -41,6 +41,7 @@ pop3 NTLM +SSL !SSPI diff --git a/tests/data/test89 b/tests/data/test89 index 65b96dbca..fc620cb23 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -89,6 +89,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test90 b/tests/data/test90 index 1c8f13944..d40b5a571 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -127,6 +127,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test906 b/tests/data/test906 index c038f7fe1..6ec59c7b1 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -27,6 +27,7 @@ smtp NTLM +SSL !SSPI debug diff --git a/tests/data/test91 b/tests/data/test91 index d54065593..4942bfddf 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -73,6 +73,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test921 b/tests/data/test921 index 577102706..f9e56736d 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -27,6 +27,7 @@ smtp NTLM +SSL !SSPI debug diff --git a/tests/data/test933 b/tests/data/test933 index 08b4e9dd0..e091de395 100644 --- a/tests/data/test933 +++ b/tests/data/test933 @@ -28,6 +28,7 @@ smtp NTLM +SSL !SSPI diff --git a/tests/data/test936 b/tests/data/test936 index 5fde3c967..b12349968 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -31,6 +31,7 @@ smtp NTLM +SSL !SSPI -- cgit v1.2.1