Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(996)

Unified Diff: chrome/browser/debugger/devtools_sanity_unittest.cc

Issue 6295010: DevTools: re-enable devtools tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/debugger/devtools_sanity_unittest.cc
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index d02da6fcb28b831ce8aaa5a4004b1966e1e611ee..0fe62a1ad283645d7d11f55480ca28e1da348d21 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -56,7 +56,6 @@ const char kPauseWhenLoadingDevTools[] =
"files/devtools/pause_when_loading_devtools.html";
const char kPauseWhenScriptIsRunning[] =
"files/devtools/pause_when_script_is_running.html";
-const char kResourceContentLengthTestPage[] = "files/devtools/image.html";
yurys 2011/01/19 09:13:26 Please remove the file as well.
const char kResourceTestPage[] = "files/devtools/resource_test_page.html";
const char kSimplePage[] = "files/devtools/simple_page.html";
const char kCompletionOnPause[] =
@@ -253,25 +252,6 @@ class DevToolsExtensionDebugTest : public DevToolsSanityTest,
FilePath test_extensions_dir_;
};
-// Fails after WebKit roll 69808:70011, http://crbug.com/59727.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestEnableResourcesTab DISABLED_TestEnableResourcesTab
-#else
-#define MAYBE_TestEnableResourcesTab TestEnableResourcesTab
-#endif // defined(OS_LINUX) || defined(OS_WIN)
-
-// Tests resources panel enabling.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestEnableResourcesTab) {
- RunTest("testEnableResourcesTab", kSimplePage);
-}
-
-// Fails after WebKit roll 59365:59477, http://crbug.com/44202.
-#if defined(OS_LINUX)
-#define MAYBE_TestResourceContentLength FLAKY_TestResourceContentLength
-#else
-#define MAYBE_TestResourceContentLength TestResourceContentLength
-#endif // defined(OS_LINUX)
-
// Tests profiler panel.
// Disabled, http://crbug.com/68447.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestProfilerTab) {
@@ -288,19 +268,11 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
RunTest("testShowScriptsTab", kDebuggerTestPage);
}
-// Fails after WebKit roll 75765:75812 (likely 75791), http://crbug.com/69719
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh \
- FAILS_TestScriptsTabIsPopulatedOnInspectedPageRefresh
-#else
-#define MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh \
- TestScriptsTabIsPopulatedOnInspectedPageRefresh
-#endif // defined(OS_LINUX) || defined(OS_WIN)
// Tests that scripts tab is populated with inspected scripts even if it
// hadn't been shown by the moment inspected paged refreshed.
// @see http://crbug.com/26312
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
- MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
+ TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
// Clear inspector settings to ensure that Elements will be
// current panel when DevTools window is open.
GetInspectedTab()->render_view_host()->delegate()->ClearInspectorSettings();
@@ -322,43 +294,16 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage);
}
-// Fails after WebKit roll 75765:75812 (likely 75791), http://crbug.com/69719
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestPauseWhenLoadingDevTools FAILS_TestPauseWhenLoadingDevTools
-#else
-#define MAYBE_TestPauseWhenLoadingDevTools TestPauseWhenLoadingDevTools
-#endif // defined(OS_LINUX) || defined(OS_WIN)
// Tests that debugger works correctly if pause event occurs when DevTools
// frontend is being loaded.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestPauseWhenLoadingDevTools) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenLoadingDevTools) {
RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools);
}
-// Fails after WebKit roll 75765:75812 (likely 75791), http://crbug.com/69719
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestPauseWhenScriptIsRunning FAILS_TestPauseWhenScriptIsRunning
-#else
-#define MAYBE_TestPauseWhenScriptIsRunning TestPauseWhenScriptIsRunning
-#endif // defined(OS_LINUX) || defined(OS_WIN)
// Tests that pressing 'Pause' will pause script execution if the script
// is already running.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestPauseWhenScriptIsRunning) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenScriptIsRunning) {
RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning);
}
-// Fails after WebKit roll 66724:66804, http://crbug.com/54592
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestCompletionOnPause FAILS_TestCompletionOnPause
-#else
-#define MAYBE_TestCompletionOnPause TestCompletionOnPause
-#endif // defined(OS_LINUX) || defined(OS_WIN)
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestCompletionOnPause) {
- RunTest("testCompletionOnPause", kCompletionOnPause);
-}
-
-// Tests that 'Pause' button works for eval.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseInEval) {
- RunTest("testPauseInEval", kDebuggerTestPage);
-}
-
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698