summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-22 16:54:54 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-22 16:54:54 +0000
commit6897d3fcdac966bb3a0c9d836b0810ef7f8ede4c (patch)
tree3a40322c5e61c3e61d659e469827fa9de180b02a /chrome
parent513c16d0056b6e60c5bb462c1028b60437f660a6 (diff)
downloadchromium_src-6897d3fcdac966bb3a0c9d836b0810ef7f8ede4c.zip
chromium_src-6897d3fcdac966bb3a0c9d836b0810ef7f8ede4c.tar.gz
chromium_src-6897d3fcdac966bb3a0c9d836b0810ef7f8ede4c.tar.bz2
Disables another SSL test as it is causing hangs.
BUG=none TEST=none TBR=jcampan Review URL: http://codereview.chromium.org/18665 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ssl/ssl_uitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc
index 7faefae..47cab12 100644
--- a/chrome/browser/ssl/ssl_uitest.cc
+++ b/chrome/browser/ssl/ssl_uitest.cc
@@ -86,7 +86,8 @@ TEST_F(SSLUITest, TestHTTP) {
// Visits a page over http which includes broken https resources (status should
// be OK).
-TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) {
+// Disabled as test causes hangs, see bug 6698 for details.
+TEST_F(SSLUITest, DISABLED_TestHTTPWithBrokenHTTPSResource) {
scoped_refptr<HTTPTestServer> http_server = PlainServer();
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
scoped_ptr<TabProxy> tab(GetActiveTabProxy());