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-07 16:19:07 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 16:19:07 +0000
commit6b1ec0993897b9fb8603db2c33621293a6b40cec (patch)
tree70a00801084ac8142409b66892569a5660e25ea5 /chrome/browser/ssl
parenteeb2fa46f8bf9ed00bf9f1516867af473a478183 (diff)
downloadchromium_src-6b1ec0993897b9fb8603db2c33621293a6b40cec.zip
chromium_src-6b1ec0993897b9fb8603db2c33621293a6b40cec.tar.gz
chromium_src-6b1ec0993897b9fb8603db2c33621293a6b40cec.tar.bz2
Disable SSLUITest.TestHTTPSExpiredCertAndDontProceed, it flakily
exceeds test timeout. TBR=jcivelli TEST=none BUG=43575 Review URL: http://codereview.chromium.org/2019004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46691 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 a29d747..22a585b 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -177,7 +177,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) {
// Visits a page with https error and don't proceed (and ensure we can still
// navigate at that point):
// Marked as flaky, see bug 40932.
-IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndDontProceed) {
+// Disabled, flakily exceeds test timeout, http://crbug.com/43575.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndDontProceed) {
scoped_refptr<HTTPTestServer> http_server = PlainServer();
ASSERT_TRUE(http_server.get() != NULL);
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();