diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 00:48:06 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 00:48:06 +0000 |
| commit | ac4335caebf2fd72609b0674fa8091198261405e (patch) | |
| tree | ff7bdc7e38b8325fe1e6a2b7b512e05550a635a9 /net/url_request/url_request_unittest.cc | |
| parent | 51065cbfb4e2a6cfa175cce600c8494cac343e87 (diff) | |
| download | chromium_src-ac4335caebf2fd72609b0674fa8091198261405e.zip chromium_src-ac4335caebf2fd72609b0674fa8091198261405e.tar.gz chromium_src-ac4335caebf2fd72609b0674fa8091198261405e.tar.bz2 | |
Revert 9992, as it broke origin-header-for-https.html on Webkit Linux builder
Review URL: http://codereview.chromium.org/21488
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_unittest.cc')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index f2028f13..5ba7165 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -180,27 +180,18 @@ TEST_F(URLRequestTest, GetTest) { #endif } -TEST_F(URLRequestTest, QuitTest) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"", NULL); - ASSERT_TRUE(NULL != server.get()); - server->SendQuit(); - EXPECT_TRUE(server->WaitToFinish(20000)); - -#ifndef NDEBUG - DCHECK_EQ(url_request_metrics.object_count, 0); -#endif -} - class HTTPSRequestTest : public testing::Test { + protected: + HTTPSRequestTest() : util_() {} + + SSLTestUtil util_; }; #if defined(OS_MACOSX) -// ssl_client_socket_mac.cc crashes currently in GetSSLInfo -// when called on a connection with an unrecognized certificate -#define MAYBE_HTTPSGetTest DISABLED_HTTPSGetTest +// TODO(port): support temporary root cert on mac +#define MAYBE_HTTPSGetTest DISABLED_HTTPSGetTest #else -#define MAYBE_HTTPSGetTest HTTPSGetTest +#define MAYBE_HTTPSGetTest HTTPSGetTest #endif TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) { @@ -209,9 +200,11 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) { // so this test doesn't really need to specify a document root. // But if it did, a good one would be net/data/ssl. scoped_refptr<HTTPSTestServer> server = - HTTPSTestServer::CreateGoodServer(L"net/data/ssl"); + HTTPSTestServer::CreateServer(util_.kHostName, util_.kOKHTTPSPort, + L"net/data/ssl", util_.GetOKCertPath().ToWStringHack()); ASSERT_TRUE(NULL != server.get()); + EXPECT_TRUE(util_.CheckCATrusted()); TestDelegate d; { TestURLRequest r(server->TestServerPage(""), &d); @@ -230,8 +223,6 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) { #endif } -// TODO(dkegel): add test for expired and mismatched certificates here - TEST_F(URLRequestTest, CancelTest) { TestDelegate d; { |