diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/tests.js | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 0eb2e2e..3c3b8d4 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenLoadingDevTools) { // Tests that pressing 'Pause' will pause script execution if the script // is already running. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseWhenScriptIsRunning) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenScriptIsRunning) { RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning); } diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index c5ca9b6..b4b5d04 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -730,9 +730,15 @@ TestSuite.prototype.testPauseWhenScriptIsRunning = function() { function(resultText) { test.assertTrue(!isNaN(resultText), 'Failed to get timer id: ' + resultText); - testScriptPause(); + testScriptPauseAfterDelay(); }); + // Wait for some time to make sure that inspected page is running the + // infinite loop. + function testScriptPauseAfterDelay() { + setTimeout(testScriptPause, 300); + } + function testScriptPause() { // The script should be in infinite loop. Click 'Pause' button to // pause it and wait for the result. |