diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 17:21:53 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 17:21:53 +0000 |
| commit | 607884fdf4e130665d08af0d9e3b989661100756 (patch) | |
| tree | daa3edc3089686374530730f4fcc7d0d6d22c92f /chrome/browser/ssl | |
| parent | 1f64fc0b216ef7187ba025f96cf9180f676e70d7 (diff) | |
| download | chromium_src-607884fdf4e130665d08af0d9e3b989661100756.zip chromium_src-607884fdf4e130665d08af0d9e3b989661100756.tar.gz chromium_src-607884fdf4e130665d08af0d9e3b989661100756.tar.bz2 | |
Marking test as flaky since it is failing in release >50% of the time now.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/489003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34253 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, 8 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 1d1b8e3..dfe084b 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -224,15 +224,20 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) { // TODO(jcampan|oshima): On linux/views, the WaitForLoadStop call // below sometimes waits forever because LOAD_STOP notification can // happen before WaitLorLoadStop is called. Marking this test as Flaky. -// See http://crbug/28098. -#define TestHTTPSErrorWithNoNavEntry FLAKY_TestHTTPSErrorWithNoNavEntry +// See http://crbug.com/28098. +#define MAYBE_TestHTTPSErrorWithNoNavEntry FLAKY_TestHTTPSErrorWithNoNavEntry +#elif defined(OS_MACOSX) +// Also flaky on Mac. http://crbug.com/29992 +#define MAYBE_TestHTTPSErrorWithNoNavEntry FLAKY_TestHTTPSErrorWithNoNavEntry +#else +#define MAYBE_TestHTTPSErrorWithNoNavEntry TestHTTPSErrorWithNoNavEntry #endif // Open a page with a HTTPS error in a tab with no prior navigation (through a // link with a blank target). This is to test that the lack of navigation entry // does not cause any problems (it was causing a crasher, see // http://crbug.com/19941). -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |