Bug 869638 - Remove xpcshell timeout timers. r=ted

This commit is contained in:
Josh Matthews 2013-05-10 10:50:33 -04:00
Родитель 3b8cd254c0
Коммит 976a997386
2 изменённых файлов: 0 добавлений и 16 удалений

Просмотреть файл

@ -513,9 +513,4 @@ function run_test() {
server = new TestServer();
run_next_test();
do_timeout(10000, function() {
do_throw(
"The test should never take this long unless the system is hosed.");
});
}

Просмотреть файл

@ -10,8 +10,6 @@
* for more information.
*/
const _XPCSHELL_TIMEOUT_MS = 5 * 60 * 1000;
var _quit = false;
var _passed = true;
var _tests_pending = 0;
@ -317,15 +315,6 @@ function _execute_test() {
// Call do_get_idle() to restore the factory and get the service.
_fakeIdleService.activate();
// Terminate asynchronous tests when a global timeout occurs.
do_timeout(_XPCSHELL_TIMEOUT_MS, function _do_main_timeout() {
try {
do_throw("test timed out");
} catch (e if e == Components.results.NS_ERROR_ABORT) {
// We don't want do_timeout to report the do_throw exception again.
}
});
// _HEAD_FILES is dynamically defined by <runxpcshelltests.py>.
_load_files(_HEAD_FILES);
// _TEST_FILE is dynamically defined by <runxpcshelltests.py>.