Bug 429592 part whatever - disable the hang monitor during all tests which also disable the DOM script timeout, since the hang monitor relies on the DOM script timeout to avoid firing on long content script, r=jmaher

--HG--
extra : rebase_source : 9ab0290b869fdb6cfa63605383728a7edcbd54a1
This commit is contained in:
Benjamin Smedberg 2011-11-11 10:37:24 -05:00
parent 937e72e1de
commit 6512ff85a3
4 changed files with 4 additions and 1 deletions

View File

@ -340,6 +340,7 @@ user_pref("browser.ui.layout.tablet", 0); // force tablet UI off
user_pref("dom.allow_scripts_to_close_windows", true);
user_pref("dom.disable_open_during_load", false);
user_pref("dom.max_script_run_time", 0); // no slow script dialogs
user_pref("hangmonitor.timeout", 0); // no hang monitor
user_pref("dom.max_chrome_script_run_time", 0);
user_pref("dom.popup_maximum", -1);
user_pref("dom.send_after_paint_to_content", true);

View File

@ -11,6 +11,7 @@ user_pref("security.fileuri.strict_origin_policy", false);
user_pref("dom.allow_scripts_to_close_windows", true);
user_pref("dom.disable_open_during_load", false);
user_pref("dom.max_script_run_time", 0);
user_pref("hangmonitor.timeout", 0);
user_pref("dom.max_chrome_script_run_time", 0);
user_pref("javascript.allow.mailnews", true);
user_pref("javascript.options.showInConsole", true);

View File

@ -111,6 +111,7 @@ RefTestCmdLineHandler.prototype =
// no slow script dialogs
branch.setIntPref("dom.max_script_run_time", 0);
branch.setIntPref("dom.max_chrome_script_run_time", 0);
branch.setIntPref("hangmonitor.timeout", 0);
var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);

View File

@ -197,7 +197,7 @@ class Firefox_runner:
userprefs.write("user_pref(\"network.proxy.autoconfig_url\", \"file://%s\");\n" % this.proxypac)
userprefs.write("user_pref(\"network.proxy.type\", 2);\n")
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
userprefs.write("user_pref(\"hangmonitor.timeout\", 0);\n");
userprefs.write("user_pref(\"dom.allow_scripts_to_close_windows\", true);\n")
userprefs.close()