summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 09:22:57 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 09:22:57 +0000
commitc21caad63ee149cfb3cf58a028a4b90f5f8e3ef7 (patch)
tree8c86bfb2bdc530eddbc274006ad2be6662599f11 /chrome/browser/ssl
parent476b876834387adb4ca59cf2332815ca7d7090db (diff)
downloadchromium_src-c21caad63ee149cfb3cf58a028a4b90f5f8e3ef7.zip
chromium_src-c21caad63ee149cfb3cf58a028a4b90f5f8e3ef7.tar.gz
chromium_src-c21caad63ee149cfb3cf58a028a4b90f5f8e3ef7.tar.bz2
Disable SSLUITest.TestGoodFrameNavigation, it flakily exceeds test timeout.
TBR=jrg BUG=18626 TEST=disabled Review URL: http://codereview.chromium.org/2116009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-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 60abe55..a485070 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -811,7 +811,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestConnectToBadPort) {
// - navigate to a bad HTTPS (expect unsafe content and filtered frame), then
// back
// - navigate to HTTP (expect insecure content), then back
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestGoodFrameNavigation) {
+// Disabled, http://crbug.com/18626.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
scoped_refptr<HTTPTestServer> http_server = PlainServer();
ASSERT_TRUE(http_server.get() != NULL);
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();