summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 17:39:00 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 17:39:00 +0000
commitab22c848ed817e0e0ced9cbf89e8bc7a2da2d218 (patch)
treeaa622644ad659d4d4b06b18b0baafed832f9a153 /chrome/browser
parent51fc9c8c30459fd973564037001298ff69042e3d (diff)
downloadchromium_src-ab22c848ed817e0e0ced9cbf89e8bc7a2da2d218.zip
chromium_src-ab22c848ed817e0e0ced9cbf89e8bc7a2da2d218.tar.gz
chromium_src-ab22c848ed817e0e0ced9cbf89e8bc7a2da2d218.tar.bz2
Disable SSLUITest.TestUnauthenticatedFrameNavigation, it flakily exceeds test timeout.
TBR=sky TEST=none BUG=43437 Review URL: http://codereview.chromium.org/2040002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 8311e91..a29d747 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -868,7 +868,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) {
// From an HTTP top frame, navigate to good and bad HTTPS (security state should
// stay unauthenticated).
// Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnauthenticatedFrameNavigation) {
+// Disabled, flakily exceeds test timeout, http://crbug.com/43437.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
scoped_refptr<HTTPTestServer> http_server = PlainServer();
ASSERT_TRUE(http_server.get() != NULL);
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();