diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 18:13:32 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 18:13:32 +0000 |
| commit | 49c3fdf47f6e7507ba1d78bf6b3813d1deb2c7d1 (patch) | |
| tree | 7450f0ca0378dcb4ac9c67eb75f78b60f5d72c00 /chrome/browser/ssl | |
| parent | 0cbfbf01e2475746b7100fadff8d2328439803c8 (diff) | |
| download | chromium_src-49c3fdf47f6e7507ba1d78bf6b3813d1deb2c7d1.zip chromium_src-49c3fdf47f6e7507ba1d78bf6b3813d1deb2c7d1.tar.gz chromium_src-49c3fdf47f6e7507ba1d78bf6b3813d1deb2c7d1.tar.bz2 | |
Make SSLUITest.TestUnauthenticatedFramNavigation flaky for mac and linux, disabled for windows.
Contributed by tessamac@chromium.org
BUG=43437
TEST=none
Review URL: http://codereview.chromium.org/2536001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48951 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 aa007c0..c2e9649 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -921,9 +921,16 @@ 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. +#if defined(OS_WIN) // Disabled, flakily exceeds test timeout, http://crbug.com/43437. -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) { +#define MAYBE_TestUnauthenticatedFrameNavigation \ + DISABLED_TestUnauthenticatedFrameNavigation +#else +// Marked as flaky, see bug 40932. +#define MAYBE_TestUnauthenticatedFrameNavigation \ + FLAKY_TestUnauthenticatedFrameNavigation +#endif +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestUnauthenticatedFrameNavigation) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |