diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 16:12:37 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 16:14:40 +0000 |
| commit | 9792d382ec7da45ef5b7a410b4c3a570207b9c0a (patch) | |
| tree | 33969ef9fb71036b4a23472a23f822ca8566772f /chrome/browser/ssl | |
| parent | 0819c8a5bd81b1995035d2cbb490200345594f51 (diff) | |
| download | chromium_src-9792d382ec7da45ef5b7a410b4c3a570207b9c0a.zip chromium_src-9792d382ec7da45ef5b7a410b4c3a570207b9c0a.tar.gz chromium_src-9792d382ec7da45ef5b7a410b4c3a570207b9c0a.tar.bz2 | |
Disable all the tests that are flaking more than 5% on Linux builders.
Data from http://chromium-build-logs.appspot.com/flakiness_dashboard?master=chromium.linux.
BUG=386891,396458,396455,396462,396464,396492,396491,396488,396484,396482,396480,180759,396477,126092,396473,396472,396468,396466
R=viettrungluu@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/417453002
Cr-Commit-Position: refs/heads/master@{#288722}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 31dcbd8..3d78d5f 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -448,7 +448,14 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) { } // Visits a page with https error and proceed: -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { +#if defined(OS_LINUX) +// flaky http://crbug.com/396462 +#define MAYBE_TestHTTPSExpiredCertAndProceed \ + DISABLED_TestHTTPSExpiredCertAndProceed +#else +#define MAYBE_TestHTTPSExpiredCertAndProceed TestHTTPSExpiredCertAndProceed +#endif +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndProceed) { ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::NavigateToURL(browser(), @@ -988,7 +995,16 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) { // Visits a page with insecure content loaded by JS (after the initial page // load). -IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { +#if defined(OS_LINUX) +// flaky http://crbug.com/396462 +#define MAYBE_TestDisplaysInsecureContentLoadedFromJS \ + DISABLED_TestDisplaysInsecureContentLoadedFromJS +#else +#define MAYBE_TestDisplaysInsecureContentLoadedFromJS \ + TestDisplaysInsecureContentLoadedFromJS +#endif +IN_PROC_BROWSER_TEST_F(SSLUITest, + MAYBE_TestDisplaysInsecureContentLoadedFromJS) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_.Start()); @@ -1755,7 +1771,15 @@ IN_PROC_BROWSER_TEST_F(SSLUITestIgnoreCertErrors, TestWSS) { // Verifies that the interstitial can proceed, even if JavaScript is disabled. // http://crbug.com/322948 -IN_PROC_BROWSER_TEST_F(SSLUITest, TestInterstitialJavaScriptProceeds) { +#if defined(OS_LINUX) +// flaky http://crbug.com/396458 +#define MAYBE_TestInterstitialJavaScriptProceeds \ + DISABLED_TestInterstitialJavaScriptProceeds +#else +#define MAYBE_TestInterstitialJavaScriptProceeds \ + TestInterstitialJavaScriptProceeds +#endif +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestInterstitialJavaScriptProceeds) { browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK); |