diff options
author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 10:36:06 +0000 |
---|---|---|
committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 10:36:06 +0000 |
commit | 4841b7784f624e7d47942fbaf459373d7f08563b (patch) | |
tree | 1098cfffc29f8f7da84cf8d98d24dc3645a86956 /net | |
parent | 17612fcb514b24fd1be2ab0e7c71bdd0f97237c9 (diff) | |
download | chromium_src-4841b7784f624e7d47942fbaf459373d7f08563b.zip chromium_src-4841b7784f624e7d47942fbaf459373d7f08563b.tar.gz chromium_src-4841b7784f624e7d47942fbaf459373d7f08563b.tar.bz2 |
Disable three tests which caused chrome_frame_net_tests hang.
TBR=rsleevi
BUG=102991
TEST=none
Review URL: http://codereview.chromium.org/8466006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/url_request/url_request_unittest.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 33fe408..c371149 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -423,7 +423,9 @@ TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) { // This is the same as the previous test, but checks that the network delegate // registers the error. -TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) { +// This test was disabled because it made chrome_frame_net_tests hang +// (see bug 102991). +TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateTunnelConnectionFailed) { ASSERT_TRUE(test_server_.Start()); TestNetworkDelegate network_delegate; // must outlive URLRequest @@ -918,7 +920,9 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) { } } -TEST_F(URLRequestTestHTTP, HTTPSToHTTPRedirectNoRefererTest) { +// This test was disabled because it made chrome_frame_net_tests hang +// (see bug 102991). +TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) { ASSERT_TRUE(test_server_.Start()); TestServer https_test_server( @@ -980,7 +984,9 @@ class HTTPSRequestTest : public testing::Test { scoped_refptr<TestURLRequestContext> default_context_; }; -TEST_F(HTTPSRequestTest, HTTPSGetTest) { +// This test was disabled because it made chrome_frame_net_tests hang +// (see bug 102991). +TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) { TestServer test_server(TestServer::TYPE_HTTPS, FilePath(FILE_PATH_LITERAL("net/data/ssl"))); ASSERT_TRUE(test_server.Start()); |