mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 06:08:24 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
116 lines
3.4 KiB
JavaScript
116 lines
3.4 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
//
|
|
// Pref management.
|
|
//
|
|
|
|
var {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
|
|
|
|
///////////////////
|
|
//
|
|
// Whitelisting these tests.
|
|
// As part of bug 1077403, the shutdown crash should be fixed.
|
|
//
|
|
// These tests may crash intermittently on shutdown if the DOM Promise uncaught
|
|
// rejection observers are still registered when the watchdog operates.
|
|
PromiseTestUtils.thisTestLeaksUncaughtRejectionsAndShouldBeFixed();
|
|
|
|
var gPrefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
|
|
|
|
function setWatchdogEnabled(enabled) {
|
|
gPrefs.setBoolPref("dom.use_watchdog", enabled);
|
|
}
|
|
|
|
function isWatchdogEnabled() {
|
|
return gPrefs.getBoolPref("dom.use_watchdog");
|
|
}
|
|
|
|
function setScriptTimeout(seconds) {
|
|
var oldTimeout = gPrefs.getIntPref("dom.max_script_run_time");
|
|
gPrefs.setIntPref("dom.max_script_run_time", seconds);
|
|
return oldTimeout;
|
|
}
|
|
|
|
//
|
|
// Utilities.
|
|
//
|
|
|
|
function busyWait(ms) {
|
|
var start = new Date();
|
|
while ((new Date()) - start < ms) {}
|
|
}
|
|
|
|
function do_log_info(aMessage)
|
|
{
|
|
print("TEST-INFO | " + _TEST_FILE + " | " + aMessage);
|
|
}
|
|
|
|
// We don't use do_execute_soon, because that inserts a
|
|
// do_test_{pending,finished} pair that gets screwed up when we terminate scripts
|
|
// from the operation callback.
|
|
function executeSoon(fn) {
|
|
var tm = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
|
|
tm.dispatchToMainThread({run: fn});
|
|
}
|
|
|
|
//
|
|
// Asynchronous watchdog diagnostics.
|
|
//
|
|
// When running, the watchdog wakes up every second, and fires the operation
|
|
// callback if the script has been running for >= the minimum script timeout.
|
|
// As such, if the script timeout is 1 second, a script should never be able to
|
|
// run for two seconds or longer without servicing the operation callback.
|
|
// We wait 3 seconds, just to be safe.
|
|
//
|
|
|
|
function checkWatchdog(expectInterrupt) {
|
|
var oldTimeout = setScriptTimeout(1);
|
|
var lastWatchdogWakeup = Cu.getWatchdogTimestamp("WatchdogWakeup");
|
|
|
|
return new Promise(resolve => {
|
|
let inBusyWait = false;
|
|
setInterruptCallback(function() {
|
|
// If the watchdog didn't actually trigger the operation callback, ignore
|
|
// this call. This allows us to test the actual watchdog behavior without
|
|
// interference from other sites where we trigger the operation callback.
|
|
if (lastWatchdogWakeup == Cu.getWatchdogTimestamp("WatchdogWakeup")) {
|
|
return true;
|
|
}
|
|
if (!inBusyWait) {
|
|
Assert.ok(true, "Not in busy wait, ignoring interrupt callback");
|
|
return true;
|
|
}
|
|
|
|
Assert.ok(expectInterrupt, "Interrupt callback fired");
|
|
setInterruptCallback(undefined);
|
|
setScriptTimeout(oldTimeout);
|
|
// Schedule the promise for resolution before we kill this script.
|
|
executeSoon(resolve);
|
|
return false;
|
|
});
|
|
|
|
executeSoon(function() {
|
|
inBusyWait = true;
|
|
busyWait(3000);
|
|
inBusyWait = false;
|
|
Assert.ok(!expectInterrupt, "Interrupt callback didn't fire");
|
|
setInterruptCallback(undefined);
|
|
setScriptTimeout(oldTimeout);
|
|
resolve();
|
|
});
|
|
});
|
|
}
|
|
|
|
function run_test() {
|
|
|
|
// Run async.
|
|
do_test_pending();
|
|
|
|
// Run the async function.
|
|
testBody().then(() => {
|
|
do_test_finished();
|
|
});
|
|
}
|
|
|