diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 21:49:27 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 21:49:27 +0000 |
| commit | 1f05db25d586c82e8420a8a28c1d0b6a7bcf44e6 (patch) | |
| tree | 896146acc5b56e95d846934a082f78caee6a97bd /chrome/browser/ssl | |
| parent | 83aec05f7614310afa04282111b697e28285fcc3 (diff) | |
| download | chromium_src-1f05db25d586c82e8420a8a28c1d0b6a7bcf44e6.zip chromium_src-1f05db25d586c82e8420a8a28c1d0b6a7bcf44e6.tar.gz chromium_src-1f05db25d586c82e8420a8a28c1d0b6a7bcf44e6.tar.bz2 | |
Make SSLUITest.TestHTTPSExpiredCertAndDontProceed flaky for mac and linux, and disabled for windows.
Contributed by tessamac@chromium.org
BUG=43575
TEST=none
Review URL: http://codereview.chromium.org/2224004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index a485070..aa007c0 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -176,9 +176,16 @@ 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. +#if defined(OS_WIN) // Disabled, flakily exceeds test timeout, http://crbug.com/43575. -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndDontProceed) { +#define MAYBE_TestHTTPSExpiredCertAndDontProceed \ + DISABLED_TestHTTPSExpiredCertAndDontProceed +#else +// Marked as flaky, see bug 40932. +#define MAYBE_TestHTTPSExpiredCertAndDontProceed \ + FLAKY_TestHTTPSExpiredCertAndDontProceed +#endif +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |