Commit b4eb2479 authored by sergeyv's avatar sergeyv Committed by Commit bot

Devtools: Fix devtoolsSanityTests TestPauseWhenScriptIsRunning & InspectSharedWorker

BUG=467072

Review URL: https://codereview.chromium.org/1007313002

Cr-Commit-Position: refs/heads/master@{#320888}
parent 4865f4b3
...@@ -766,14 +766,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, ...@@ -766,14 +766,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
// Tests that pressing 'Pause' will pause script execution if the script // Tests that pressing 'Pause' will pause script execution if the script
// is already running. // is already running.
// Disabled because it fails on all trunk official build bots. #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
// http://crbug.com/467072
// Previous condition:
// defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
// Timing out on linux ARM bot: https://crbug/238453 // Timing out on linux ARM bot: https://crbug/238453
#define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning #define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning
#else
#define MAYBE_TestPauseWhenScriptIsRunning TestPauseWhenScriptIsRunning
#endif
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
DISABLED_TestPauseWhenScriptIsRunning) { MAYBE_TestPauseWhenScriptIsRunning) {
RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning); RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning);
} }
...@@ -873,9 +873,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { ...@@ -873,9 +873,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
CloseDevToolsWindow(); CloseDevToolsWindow();
} }
// Disabled because it fails on all trunk official build bots. IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, InspectSharedWorker) {
// http://crbug.com/467072
IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, DISABLED_InspectSharedWorker) {
#if defined(OS_WIN) && defined(USE_ASH) #if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796). // Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (base::CommandLine::ForCurrentProcess()->HasSwitch( if (base::CommandLine::ForCurrentProcess()->HasSwitch(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment