From 4d245165098d64e0a592daf8b0665ed58b4b7b69 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Tue, 14 Feb 2012 23:54:26 +0000 Subject: Flakiness cleanup: disable flaky tests under chrome/browser/ Part 1 of N. See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=104132,52928,100062,89762,82616,44668,44666,62537,69034,62538,81451,67301,62539,81451,69475,106538,84427,114104,103539,100538,109669,74557,96725,52544,68287,86105,89727,96725,95274,80961,83876 Review URL: http://codereview.chromium.org/9361066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121975 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_tabs_apitest.cc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc') diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 07e668f..ecb84ec 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { } // Flaky on the trybots. See http://crbug.com/96725. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_TabConnect) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabConnect) { ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; } @@ -117,12 +117,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabReload) { // Test is timing out on linux and cros and flaky on others. // See http://crbug.com/83876 -#if defined(OS_LINUX) -#define MAYBE_CaptureVisibleTabJpeg DISABLED_CaptureVisibleTabJpeg -#else -#define MAYBE_CaptureVisibleTabJpeg FLAKY_CaptureVisibleTabJpeg -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabJpeg) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); @@ -132,12 +127,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { // Test is timing out on linux and cros and flaky on others. // See http://crbug.com/83876 -#if defined(OS_LINUX) -#define MAYBE_CaptureVisibleTabPng DISABLED_CaptureVisibleTabPng -#else -#define MAYBE_CaptureVisibleTabPng FLAKY_CaptureVisibleTabPng -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabPng) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); -- cgit v1.1