diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 08:05:15 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 08:05:15 +0000 |
| commit | b0dafaf9f930b128ef43d752c15a1bdb7620062b (patch) | |
| tree | 7d6f4123ef01054de5ec487ea68bc27e3f299374 /chrome | |
| parent | 1b6146b8dbfed02edff75a29fddc501e2af448e1 (diff) | |
| download | chromium_src-b0dafaf9f930b128ef43d752c15a1bdb7620062b.zip chromium_src-b0dafaf9f930b128ef43d752c15a1bdb7620062b.tar.gz chromium_src-b0dafaf9f930b128ef43d752c15a1bdb7620062b.tar.bz2 | |
Disable InspectSharedWorker/PauseInSharedWorkInitialization across all platforms, due to timeouts
BUG=100538,89845
TBR=adamk@chromium.org
Review URL: http://codereview.chromium.org/8681003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 81f6658..282b135 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -538,25 +538,13 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { CloseDevToolsWindow(); } -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) -#define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker -#else -#define MAYBE_InspectSharedWorker FAILS_InspectSharedWorker -#endif // Flakily fails with 25s timeout: http://crbug.com/89845 -IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) { +IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, DISABLED_InspectSharedWorker) { RunTest("testSharedWorker", kSharedWorkerTestPage); } -// http://crbug.com/100538 -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) -#define MAYBE_PauseInSharedWorkerInitialization DISABLED_PauseInSharedWorkerInitialization -#else -#define MAYBE_PauseInSharedWorkerInitialization FAILS_PauseInSharedWorkerInitialization -#endif -// See http://crbug.com/100538 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, - MAYBE_PauseInSharedWorkerInitialization) { + DISABLED_PauseInSharedWorkerInitialization) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage); ui_test_utils::NavigateToURL(browser(), url); |