summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 14:57:32 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 14:57:32 +0000
commit390113a45ba7d8cf8a7bd4702d685bab003e2cf9 (patch)
tree27fbebb6a02017c0eb9a4be5973f8568b8b00cfe /chrome
parent2b88c1a7c83e8acee10e0b2c3cc40d3447d3fd59 (diff)
downloadchromium_src-390113a45ba7d8cf8a7bd4702d685bab003e2cf9.zip
chromium_src-390113a45ba7d8cf8a7bd4702d685bab003e2cf9.tar.gz
chromium_src-390113a45ba7d8cf8a7bd4702d685bab003e2cf9.tar.bz2
DevTools: remove debugger step tests that have been converted into WebKit layout tests
BUG=45080,46299 Review URL: http://codereview.chromium.org/3116015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc52
-rw-r--r--chrome/test/data/devtools/debugger_step.html25
-rw-r--r--chrome/test/data/devtools/debugger_step.js16
3 files changed, 0 insertions, 93 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 1eb48b6..46ad42f 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -64,8 +64,6 @@ const char kResourceTestPage[] = "files/devtools/resource_test_page.html";
const char kSimplePage[] = "files/devtools/simple_page.html";
const char kSyntaxErrorTestPage[] =
"files/devtools/script_syntax_error.html";
-const char kDebuggerStepTestPage[] =
- "files/devtools/debugger_step.html";
const char kDebuggerClosurePage[] =
"files/devtools/debugger_closure.html";
const char kCompletionOnPause[] =
@@ -375,56 +373,6 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalOnCallFrame) {
RunTest("testEvalOnCallFrame", kDebuggerTestPage);
}
-#if defined(OS_WIN) || defined(OS_LINUX)
-// Sometimes it times out.
-// See http://crbug.com/45080
-// See http://crbug.com/46299
-#define MAYBE_TestStepOver FLAKY_TestStepOver
-#else
-#define MAYBE_TestStepOver TestStepOver
-#endif
-// Tests step over functionality in the debugger.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOver) {
- RunTest("testStepOver", kDebuggerStepTestPage);
-}
-
-#if defined(OS_WIN) || defined(OS_LINUX)
-// Sometimes it times out.
-// See http://crbug.com/45080
-// See http://crbug.com/46299
-#define MAYBE_TestStepOut FLAKY_TestStepOut
-#elif defined(OS_CHROMEOS)
-// See http://crbug.com/43479
-#define MAYBE_TestStepOut FLAKY_TestStepOut
-#else
-#define MAYBE_TestStepOut TestStepOut
-#endif
-// Tests step out functionality in the debugger.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOut) {
- RunTest("testStepOut", kDebuggerStepTestPage);
-}
-
-#if defined(OS_WIN) || defined(OS_LINUX)
-// Sometimes it times out.
-// See http://crbug.com/45080
-// See http://crbug.com/46299
-#define MAYBE_TestStepIn FLAKY_TestStepIn
-#elif defined(OS_CHROMEOS)
-// See http://crbug.com/43479
-#define MAYBE_TestStepIn FLAKY_TestStepIn
-#else
-#define MAYBE_TestStepIn TestStepIn
-#endif
-// Disable TestStepIn completely while test expectations are not updated
-// in Webkit. See http://crbug.com/46235
-#undef MAYBE_TestStepIn
-#define MAYBE_TestStepIn DISABLED_TestStepIn
-
-// Tests step in functionality in the debugger.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) {
- RunTest("testStepIn", kDebuggerStepTestPage);
-}
-
// Tests that scope can be expanded and contains expected variables.
// TODO(japhet): Disabled during webkit landing per bug http://crbug.com/52085
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestExpandScope) {
diff --git a/chrome/test/data/devtools/debugger_step.html b/chrome/test/data/devtools/debugger_step.html
deleted file mode 100644
index c26cb16..0000000
--- a/chrome/test/data/devtools/debugger_step.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-
-<script src='debugger_step.js'></script>
-<script>
-
-function a() {
- var result = d(true);
- printResult(result);
-}
-
-function printResult(r) {
- var e = document.getElementById('result');
- e.appendChild(document.createTextNode(r));
-}
-
-</script>
-
-<body >
-<p onclick="a()">
-Calculate
-</p>
-<div id='result'>Result = </div>
-
-</body>
-</html>
diff --git a/chrome/test/data/devtools/debugger_step.js b/chrome/test/data/devtools/debugger_step.js
deleted file mode 100644
index bdd856e..0000000
--- a/chrome/test/data/devtools/debugger_step.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function d(arg) {
- if (arg) {
- debugger;
- }
- var y = fact(10);
- return y;
-}
-
-function fact(n) {
- var r = 1;
- while (n > 1) {
- r *= n;
- --n;
- }
- return r;
-}