diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 02:26:26 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 02:26:26 +0000 |
| commit | 75035e50347c30ce753a7ebb35ab3d5daceacfaa (patch) | |
| tree | 8b7bc757d2c1c09a310641efbc3269847f45c836 /chrome/browser/debugger | |
| parent | 7519f1aba624283d5bbde1ecf5de6b8624b691dd (diff) | |
| download | chromium_src-75035e50347c30ce753a7ebb35ab3d5daceacfaa.zip chromium_src-75035e50347c30ce753a7ebb35ab3d5daceacfaa.tar.gz chromium_src-75035e50347c30ce753a7ebb35ab3d5daceacfaa.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
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); } |