summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 15:46:58 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 15:46:58 +0000
commit48a74f65c7775737ccee06a34eb5f73a5172172f (patch)
treeb16a3bfaae71255af099d93ada89c5cee2f31816 /webkit
parent6ee7d1161d55d6cb3f21e9bf702ae7f726d50fb8 (diff)
downloadchromium_src-48a74f65c7775737ccee06a34eb5f73a5172172f.zip
chromium_src-48a74f65c7775737ccee06a34eb5f73a5172172f.tar.gz
chromium_src-48a74f65c7775737ccee06a34eb5f73a5172172f.tar.bz2
DevTools: fix on Linux and reenable DevToolsSanityTest.TestPauseWhenScriptIsRunning
Review URL: http://codereview.chromium.org/449013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/tests.js8
1 files changed, 7 insertions, 1 deletions
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.