mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +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
107 lines
4.5 KiB
JavaScript
107 lines
4.5 KiB
JavaScript
var {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
/**
|
|
* Test optional duration reporting that can be used for telemetry.
|
|
*/
|
|
add_task(async function duration() {
|
|
const availableDurations = ["outSerializationDuration", "outExecutionDuration"];
|
|
Services.prefs.setBoolPref("toolkit.osfile.log", true);
|
|
// Options structure passed to a OS.File copy method.
|
|
let copyOptions = {
|
|
// These fields should be overwritten with the actual duration
|
|
// measurements.
|
|
outSerializationDuration: null,
|
|
outExecutionDuration: null,
|
|
};
|
|
let currentDir = await OS.File.getCurrentDirectory();
|
|
let pathSource = OS.Path.join(currentDir, "test_duration.js");
|
|
let copyFile = pathSource + ".bak";
|
|
function testOptions(options, name, durations = availableDurations) {
|
|
for (let duration of durations) {
|
|
info(`Checking ${duration} for operation: ${name}`);
|
|
info(`${name}: Gathered method duration time: ${options[duration]} ms`);
|
|
// Making sure that duration was updated.
|
|
Assert.equal(typeof options[duration], "number");
|
|
Assert.ok(options[duration] >= 0);
|
|
}
|
|
}
|
|
|
|
function testOptionIncrements(options, name, backupDuration, durations = availableDurations) {
|
|
for (let duration of durations) {
|
|
info(`Checking ${duration} increment for operation: ${name}`);
|
|
info(`${name}: Gathered method duration time: ${options[duration]} ms`);
|
|
info(`${name}: Previous duration: ${backupDuration[duration]} ms`);
|
|
// Making sure that duration was incremented.
|
|
Assert.ok(options[duration] >= backupDuration[duration]);
|
|
}
|
|
}
|
|
|
|
// Testing duration of OS.File.copy.
|
|
await OS.File.copy(pathSource, copyFile, copyOptions);
|
|
testOptions(copyOptions, "OS.File.copy");
|
|
await OS.File.remove(copyFile);
|
|
|
|
// Trying an operation where options are cloned.
|
|
let pathDest = OS.Path.join(OS.Constants.Path.tmpDir,
|
|
"osfile async test read writeAtomic.tmp");
|
|
let tmpPath = pathDest + ".tmp";
|
|
let readOptions = {
|
|
// We do not check for |outSerializationDuration| since |Scheduler.post|
|
|
// may not be called whenever |read| is called.
|
|
outExecutionDuration: null,
|
|
};
|
|
let contents = await OS.File.read(pathSource, undefined, readOptions);
|
|
testOptions(readOptions, "OS.File.read", ["outExecutionDuration"]);
|
|
// Options structure passed to a OS.File writeAtomic method.
|
|
let writeAtomicOptions = {
|
|
// This field should be first initialized with the actual
|
|
// duration measurement then progressively incremented.
|
|
outExecutionDuration: null,
|
|
tmpPath,
|
|
};
|
|
// Note that |contents| cannot be reused after this call since it is detached.
|
|
await OS.File.writeAtomic(pathDest, contents, writeAtomicOptions);
|
|
testOptions(writeAtomicOptions, "OS.File.writeAtomic", ["outExecutionDuration"]);
|
|
await OS.File.remove(pathDest);
|
|
|
|
info(`Ensuring that we can use ${availableDurations.join(", ")} to accumulate durations`);
|
|
|
|
let ARBITRARY_BASE_DURATION = 5;
|
|
copyOptions = {
|
|
// This field should now be incremented with the actual duration
|
|
// measurement.
|
|
outSerializationDuration: ARBITRARY_BASE_DURATION,
|
|
outExecutionDuration: ARBITRARY_BASE_DURATION,
|
|
};
|
|
|
|
// We need to copy the object, since having a reference would make this pointless.
|
|
let backupDuration = Object.assign({}, copyOptions);
|
|
|
|
// Testing duration of OS.File.copy.
|
|
await OS.File.copy(pathSource, copyFile, copyOptions);
|
|
testOptionIncrements(copyOptions, "copy", backupDuration);
|
|
|
|
backupDuration = Object.assign({}, copyOptions);
|
|
await OS.File.remove(copyFile, copyOptions);
|
|
testOptionIncrements(copyOptions, "remove", backupDuration);
|
|
|
|
// Trying an operation where options are cloned.
|
|
// Options structure passed to a OS.File writeAtomic method.
|
|
writeAtomicOptions = {
|
|
// We do not check for |outSerializationDuration| since |Scheduler.post|
|
|
// may not be called whenever |writeAtomic| is called.
|
|
outExecutionDuration: ARBITRARY_BASE_DURATION,
|
|
};
|
|
writeAtomicOptions.tmpPath = tmpPath;
|
|
backupDuration = Object.assign({}, writeAtomicOptions);
|
|
contents = await OS.File.read(pathSource, undefined, readOptions);
|
|
await OS.File.writeAtomic(pathDest, contents, writeAtomicOptions);
|
|
testOptionIncrements(writeAtomicOptions, "writeAtomicOptions", backupDuration, ["outExecutionDuration"]);
|
|
OS.File.remove(pathDest);
|
|
|
|
// Testing an operation that doesn't take arguments at all
|
|
let file = await OS.File.open(pathSource);
|
|
await file.stat();
|
|
await file.close();
|
|
});
|