wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 858723 - Fix _fdmsg test in async OS.File. r=froydnj

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2013-04-23 08:22:15 -04:00
parent 419f7072af
commit 7351de4ede
6 changed files with 114 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/components/osfile/osfile_async_front.jsm
View File

@ -237,7 +237,7 @@ File.prototype = {
* @rejects {OS.File.Error}
*/
close: function close() {
if (this._fdmsg) {
if (this._fdmsg != null) {
let msg = this._fdmsg;
this._fdmsg = null;
return this._closeResult =
@ -254,9 +254,6 @@ File.prototype = {
* @rejects {OS.File.Error}
*/
stat: function stat() {
if (!this._fdmsg) {
return Promise.reject(OSError.closed("accessing file"));
}
return Scheduler.post("File_prototype_stat", [this._fdmsg], this).then(
File.Info.fromMsg
);

11
toolkit/components/osfile/osfile_async_worker.js
View File

@ -162,10 +162,13 @@ if (this.Components) {
* the file exists, it executes |f| within the |this| set
* to the corresponding file. Otherwise, it throws an error.
*/
let withFile = function withFile(id, f) {
let withFile = function withFile(id, f, ignoreAbsent) {
let file = OpenedFiles.get(id);
if (file == null) {
throw new Error("Could not find File");
if (!ignoreAbsent) {
throw OS.File.Error.closed("accessing file");
}
return undefined;
}
return f.call(file);
};
@ -175,9 +178,9 @@ if (this.Components) {
let file = OpenedDirectoryIterators.get(fd);
if (file == null) {
if (!ignoreAbsent) {
throw new Error("Could not find Directory");
throw OS.File.Error.closed("accessing directory");
}
return;
return undefined;
}
if (!(file instanceof File.DirectoryIterator)) {
throw new Error("file is not a directory iterator " + file.__proto__.toSource());

6
toolkit/components/osfile/osfile_win_allthreads.jsm
View File

@ -148,7 +148,7 @@ if (typeof Components != "undefined") {
*/
Object.defineProperty(OSError.prototype, "becauseClosed", {
get: function becauseClosed() {
return this.winLastError == exports.OS.Constants.Win.INVALID_HANDLE_VALUE;
return this.winLastError == exports.OS.Constants.Win.ERROR_INVALID_HANDLE;
}
});
@ -159,7 +159,7 @@ if (typeof Components != "undefined") {
OSError.toMsg = function toMsg(error) {
return {
operation: error.operation,
winLastError: error.winLastError
winLastError: error.winLastError
};
};
@ -336,7 +336,7 @@ if (typeof Components != "undefined") {
// Special constructors that need to be defined on all threads
OSError.closed = function closed(operation) {
return new OSError(operation, exports.OS.Constants.Win.INVALID_HANDLE_VALUE);
return new OSError(operation, exports.OS.Constants.Win.ERROR_INVALID_HANDLE);
};
OSError.exists = function exists(operation) {

88
toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
View File

@ -695,6 +695,7 @@ let test_iter = maketest("iter", function iter(test) {
}
return null;
});
yield iterator.close();
// Ensuring that we find new files if they appear
let file = yield OS.File.open(temporary_file_name, { write: true } );
@ -815,45 +816,60 @@ let test_system_shutdown = maketest("system_shutdown", function system_shutdown(
// Save original DEBUG value.
let originalDebug = OS.Shared.DEBUG;
// Create a console listener.
function getConsoleListener(resource) {
let consoleListener = {
observe: function (aMessage) {
// Ignore unexpected messages.
if (!(aMessage instanceof Components.interfaces.nsIConsoleMessage)) {
return;
function inDebugTest(resource, f) {
return Task.spawn(function task() {
let originalDebug = OS.Shared.DEBUG;
OS.Shared.TEST = true;
OS.Shared.DEBUG = true;
let waitObservation = Promise.defer();
let listener = {
observe: function (aMessage) {
test.info("Waiting for a console message mentioning resource " + resource);
// Ignore unexpected messages.
if (!(aMessage instanceof Components.interfaces.nsIConsoleMessage)) {
test.info("Not a console message");
return;
}
if (aMessage.message.indexOf("TEST OS Controller WARNING") < 0) {
test.info("Not a warning");
return;
}
test.ok(aMessage.message.indexOf("WARNING: File descriptors leaks " +
"detected.") >= 0, "Noticing file descriptors leaks, as expected.");
let found = aMessage.message.indexOf(resource) >= 0;
if (found) {
test.ok(true, "Leaked resource is correctly listed in the log.");
setTimeout(function() { waitObservation.resolve(); });
} else {
test.info("This log didn't list the expected resource: " + resource + "\ngot " + aMessage.message);
}
}
if (aMessage.message.indexOf("TEST OS Controller WARNING") < 0) {
return;
}
test.ok(aMessage.message.indexOf("WARNING: File descriptors leaks " +
"detected.") >= 0, "File descriptors leaks are logged correctly.");
test.ok(aMessage.message.indexOf(resource) >= 0,
"Leaked resource is correctly listed in the log.");
toggleDebugTest(false, resource, consoleListener);
}
};
return consoleListener;
}
// Set/Unset testing flags and Services.console listener.
function toggleDebugTest(startDebug, resource, consoleListener) {
Services.console[startDebug ? "registerListener" : "unregisterListener"](
consoleListener || getConsoleListener(resource));
OS.Shared.TEST = startDebug;
// If pref is false, restore DEBUG to its original.
OS.Shared.DEBUG = startDebug || originalDebug;
};
Services.console.registerListener(listener);
f();
yield waitObservation.promise;
Services.console.unregisterListener(listener);
OS.Shared.DEBUG = originalDebug;
OS.Shared.TEST = false;
test.info("Unregistered listener for resource " + resource);
});
}
let currentDir = yield OS.File.getCurrentDirectory();
test.info("Testing for leaks of directory iterator " + currentDir);
let iterator = new OS.File.DirectoryIterator(currentDir);
toggleDebugTest(true, currentDir);
Services.obs.notifyObservers(null, "test.osfile.web-workers-shutdown",
null);
yield inDebugTest(currentDir, function() {
Services.obs.notifyObservers(null, "test.osfile.web-workers-shutdown",
null);
});
yield iterator.close();
test.info("Testing for leaks of file " + EXISTING_FILE);
let openedFile = yield OS.File.open(EXISTING_FILE);
toggleDebugTest(true, EXISTING_FILE);
Services.obs.notifyObservers(null, "test.osfile.web-workers-shutdown",
null);
yield inDebugTest(EXISTING_FILE, function() {
Services.obs.notifyObservers(null, "test.osfile.web-workers-shutdown",
null);
});
yield openedFile.close();
});
});
@ -916,11 +932,11 @@ let test_duration = maketest("duration", function duration(test) {
let backupDuration = ARBITRARY_BASE_DURATION;
// Testing duration of OS.File.copy.
yield OS.File.copy(pathSource, copyFile, copyOptions);
test.ok(copyOptions.outExecutionDuration >= backupDuration);
test.ok(copyOptions.outExecutionDuration >= backupDuration, "duration has increased 1");
backupDuration = copyOptions.outExecutionDuration;
yield OS.File.remove(copyFile, copyOptions);
test.ok(copyOptions.outExecutionDuration >= backupDuration);
test.ok(copyOptions.outExecutionDuration >= backupDuration, "duration has increased 2");
// Trying an operation where options are cloned.
// Options structure passed to a OS.File writeAtomic method.
@ -931,10 +947,14 @@ let test_duration = maketest("duration", function duration(test) {
tmpPath: tmpPath
};
backupDuration = writeAtomicOptions.outExecutionDuration;
yield OS.File.writeAtomic(pathDest, contents, writeAtomicOptions);
test.ok(copyOptions.outExecutionDuration >= backupDuration);
test.ok(copyOptions.outExecutionDuration >= backupDuration, "duration has increased 3");
OS.File.remove(pathDest);
Services.prefs.setBoolPref("toolkit.osfile.log", true);
OS.Shared.TEST = true;
// Testing an operation that doesn't take arguments at all
let file = yield OS.File.open(pathSource);
yield file.stat();

48
toolkit/components/osfile/tests/xpcshell/test_osfile_closed.js Normal file
View File

@ -0,0 +1,48 @@
"use strict";
Components.utils.import("resource://gre/modules/osfile.jsm");
Components.utils.import("resource://gre/modules/Task.jsm");
function run_test() {
do_test_pending();
run_next_test();
}
add_task(function test_closed() {
OS.Shared.DEBUG = true;
let currentDir = yield OS.File.getCurrentDirectory();
do_print("Open a file, ensure that we can call stat()");
let path = OS.Path.join(currentDir, "test_osfile_closed.js");
let file = yield OS.File.open(path);
yield file.stat();
do_check_true(true);
yield file.close();
do_print("Ensure that we cannot stat() on closed file");
let exn;
try {
yield file.stat();
} catch (ex) {
exn = ex;
}
do_print("Ensure that this raises the correct error");
do_check_true(!!exn);
do_check_true(exn instanceof OS.File.Error);
do_check_true(exn.becauseClosed);
do_print("Ensure that we cannot read() on closed file");
exn = null;
try {
yield file.read();
} catch (ex) {
exn = ex;
}
do_print("Ensure that this raises the correct error");
do_check_true(!!exn);
do_check_true(exn instanceof OS.File.Error);
do_check_true(exn.becauseClosed);
});
add_task(do_test_finished);

1
toolkit/components/osfile/tests/xpcshell/xpcshell.ini
View File

@ -2,6 +2,7 @@
head =
tail =
[test_osfile_closed.js]
[test_path.js]
[test_osfile_async.js]
[test_profiledir.js]