From 75035e50347c30ce753a7ebb35ab3d5daceacfaa Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Thu, 8 Apr 2010 02:26:26 +0000 Subject: TestResoruceContentLength is flaky on linux_views,chromeos BUG=40764 TEST=interactive_ui_tests on linux_views/chromeos should stay green. TBR=pfeldman@chromium.org Review URL: http://codereview.chromium.org/1553017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43917 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/debugger/devtools_sanity_unittest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'chrome/browser/debugger') diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index d88a0c5..ee99d55 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -19,6 +19,13 @@ #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +// See http://crbug.com/40764 for details. +#define MAYBE_TestResourceContentLength FLAKY_TestResourceContentLength +#else +#define MAYBE_TestResourceContentLength TestResourceContentLength +#endif + namespace { // Used to block until a dev tools client window's browser is closed. @@ -281,7 +288,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) { } // Tests resources have correct sizes. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestResourceContentLength) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestResourceContentLength) { RunTest("testResourceContentLength", kResourceContentLengthTestPage); } -- cgit v1.1