| Index: net/http/http_network_transaction_unittest.cc
|
| ===================================================================
|
| --- net/http/http_network_transaction_unittest.cc (revision 22897)
|
| +++ net/http/http_network_transaction_unittest.cc (working copy)
|
| @@ -23,6 +23,16 @@
|
|
|
| //-----------------------------------------------------------------------------
|
|
|
| +#if defined(NTLM_SSPI)
|
| +// For NTLM implementation using SSPI, we ignore the NTLM tests since it is
|
| +// not possible to predict the NTLM authorization headers.
|
| +#define MAYBE_NTLMAuth1 DISABLED_NTLMAuth1
|
| +#define MAYBE_NTLMAuth2 DISABLED_NTLMAuth2
|
| +#elif defined(NTLM_PORTABLE)
|
| +#define MAYBE_NTLMAuth1 NTLMAuth1
|
| +#define MAYBE_NTLMAuth2 NTLMAuth2
|
| +#endif
|
| +
|
| namespace net {
|
|
|
| // Create a proxy service which fails on all requests (falls back to direct).
|
| @@ -1450,12 +1460,13 @@
|
| EXPECT_EQ(100, response->headers->GetContentLength());
|
| }
|
|
|
| +#if defined(NTLM_PORTABLE)
|
| // The NTLM authentication unit tests were generated by capturing the HTTP
|
| // requests and responses using Fiddler 2 and inspecting the generated random
|
| // bytes in the debugger.
|
|
|
| // Enter the correct password and authenticate successfully.
|
| -TEST_F(HttpNetworkTransactionTest, NTLMAuth1) {
|
| +TEST_F(HttpNetworkTransactionTest, MAYBE_NTLMAuth1) {
|
| HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom1,
|
| MockGetHostName);
|
| SessionDependencies session_deps;
|
| @@ -1578,7 +1589,7 @@
|
| }
|
|
|
| // Enter a wrong password, and then the correct one.
|
| -TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
|
| +TEST_F(HttpNetworkTransactionTest, MAYBE_NTLMAuth2) {
|
| HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom2,
|
| MockGetHostName);
|
| SessionDependencies session_deps;
|
| @@ -1778,6 +1789,7 @@
|
| EXPECT_TRUE(response->auth_challenge.get() == NULL);
|
| EXPECT_EQ(13, response->headers->GetContentLength());
|
| }
|
| +#endif
|
|
|
| // Test reading a server response which has only headers, and no body.
|
| // After some maximum number of bytes is consumed, the transaction should
|
|
|