From 2565b8767b59ca8e85ce70bc98e4a12d861548c0 Mon Sep 17 00:00:00 2001 From: "dgozman@chromium.org" Date: Fri, 1 Aug 2014 11:57:52 +0000 Subject: [PATCH] [DevTools] Reenable some DevTools tests, which should be fixed on blink side. BUG=315288,329036,219515 Review URL: https://codereview.chromium.org/435603003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286978 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/devtools/devtools_sanity_browsertest.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index ef6ce35a2198..5ae8a2725bf2 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -681,8 +681,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, } // Tests scripts panel showing. -// TODO(pfeldman): figure out flake. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestShowScriptsTab) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { RunTest("testShowScriptsTab", kDebuggerTestPage); } @@ -734,33 +733,28 @@ IN_PROC_BROWSER_TEST_F(DevToolsExperimentalExtensionTest, } // Tests that a content script is in the scripts list. -// History of flakiness: http://crbug.com/114104, http://crbug.com/315288. IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, - DISABLED_TestContentScriptIsPresent) { + TestContentScriptIsPresent) { LoadExtension("simple_content_script"); RunTest("testContentScriptIsPresent", kPageWithContentScript); } // Tests that scripts are not duplicated after Scripts Panel switch. IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, - DISABLED_TestNoScriptDuplicatesOnPanelSwitch) { + TestNoScriptDuplicatesOnPanelSwitch) { RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage); } // Tests that debugger works correctly if pause event occurs when DevTools // frontend is being loaded. -// Disabled because of flakiness on all platforms: crbug.com/329036 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, - DISABLED_TestPauseWhenLoadingDevTools) { + TestPauseWhenLoadingDevTools) { RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools); } // Tests that pressing 'Pause' will pause script execution if the script // is already running. -#if defined(OS_WIN) -// Timing out on windows tryservers: http://crbug.com/219515 -#define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) // Timing out on linux ARM bot: https://crbug/238453 #define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning #else -- 2.11.4.GIT