summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-11 16:12:37 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-11 16:14:40 +0000
commit9792d382ec7da45ef5b7a410b4c3a570207b9c0a (patch)
tree33969ef9fb71036b4a23472a23f822ca8566772f /chrome
parent0819c8a5bd81b1995035d2cbb490200345594f51 (diff)
downloadchromium_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')
-rw-r--r--chrome/browser/component_updater/test/component_updater_service_unittest.cc8
-rw-r--r--chrome/browser/extensions/extension_incognito_apitest.cc9
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc30
-rw-r--r--chrome/browser/ui/global_error/global_error_service_browsertest.cc3
-rw-r--r--chrome/browser/ui/panels/docked_panel_browsertest.cc8
-rw-r--r--chrome/test/ppapi/ppapi_browsertest.cc13
6 files changed, 55 insertions, 16 deletions
diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
index c05fe7b..bb9aa36 100644
--- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
@@ -460,7 +460,13 @@ TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
// nothing happens.
// - We make an on demand call.
// - This triggers a second loop, which has a reply that triggers an install.
-TEST_F(ComponentUpdaterTest, OnDemandUpdate) {
+#if defined(OS_LINUX)
+// http://crbug.com/396488
+#define MAYBE_OnDemandUpdate DISABLED_OnDemandUpdate
+#else
+#define MAYBE_OnDemandUpdate OnDemandUpdate
+#endif
+TEST_F(ComponentUpdaterTest, MAYBE_OnDemandUpdate) {
MockServiceObserver observer;
{
InSequence seq;
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc
index b43833c..c0ac869 100644
--- a/chrome/browser/extensions/extension_incognito_apitest.cc
+++ b/chrome/browser/extensions/extension_incognito_apitest.cc
@@ -184,14 +184,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) {
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}
-#if defined(OS_WIN) || defined(OS_MACOSX)
-// http://crbug.com/104438.
-#define MAYBE_IncognitoPopup DISABLED_IncognitoPopup
-#else
-#define MAYBE_IncognitoPopup IncognitoPopup
-#endif
// Test that opening a popup from an incognito browser window works properly.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoPopup) {
+// http://crbug.com/180759.
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoPopup) {
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(StartEmbeddedTestServer());
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);
diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
index ae23831..3f84666 100644
--- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
@@ -112,7 +112,8 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, CloseBubbleView) {
// Test that bubble is silently dismissed if it is showing when the GlobalError
// instance is removed from the profile.
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
+// http://crbug.com/396473
#define MAYBE_BubbleViewDismissedOnRemove DISABLED_BubbleViewDismissedOnRemove
#else
#define MAYBE_BubbleViewDismissedOnRemove BubbleViewDismissedOnRemove
diff --git a/chrome/browser/ui/panels/docked_panel_browsertest.cc b/chrome/browser/ui/panels/docked_panel_browsertest.cc
index fad6fc9..f79e91c 100644
--- a/chrome/browser/ui/panels/docked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/docked_panel_browsertest.cc
@@ -91,7 +91,13 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezePanelsInDock) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezeAndThenSomeMore) {
+#if defined(OS_LINUX)
+// http://crbug.com/396484
+#define MAYBE_SqueezeAndThenSomeMore DISABLED_SqueezeAndThenSomeMore
+#else
+#define MAYBE_SqueezeAndThenSomeMore SqueezeAndThenSomeMore
+#endif
+IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection();
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index bece9c7..b590bfc 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1067,8 +1067,14 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
LIST_TEST(Audio_AudioCallback4) \
)
+#if defined(OS_LINUX)
+// http://crbug.com/396464
+#define MAYBE_Audio DISABLED_Audio
+#else
+#define MAYBE_Audio Audio
+#endif
// PPB_Audio is not supported in-process.
-IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) {
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) {
RUN_AUDIO_SUBTESTS;
}
IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) {
@@ -1247,8 +1253,9 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) {
#define MAYBE_Compositor0 DISABLED_Compositor0
#define MAYBE_Compositor1 DISABLED_Compositor1
#else
-#define MAYBE_Compositor0 Compositor0
-#define MAYBE_Compositor1 Compositor1
+// flaky on Linux: http://crbug.com/396482
+#define MAYBE_Compositor0 DISABLED_Compositor0
+#define MAYBE_Compositor1 DISABLED_Compositor1
#endif
TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0)