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 935792 - ignoreAbsent flag for removeDir() doesn't default to true as intended/documented. r=froydnj

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2013-11-26 14:21:03 -05:00
parent 50ab6fe45c
commit 870d35a850
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/components/osfile/modules/osfile_shared_front.jsm
View File

@ -474,8 +474,10 @@ AbstractFile.writeAtomic =
*/
AbstractFile.removeDir = function(path, options = {}) {
let iterator = new OS.File.DirectoryIterator(path);
if (!iterator.exists() && options.ignoreAbsent) {
return;
if (!iterator.exists()) {
if (!("ignoreAbsent" in options) || options.ignoreAbsent) {
return;
}
}
try {

12
toolkit/components/osfile/tests/xpcshell/test_removeDir.js
View File

@ -36,7 +36,7 @@ add_task(function() {
// Remove non-existent directory
let exception = null;
try {
yield OS.File.removeDir(dir);
yield OS.File.removeDir(dir, {ignoreAbsent: false});
} catch (ex) {
exception = ex;
}
@ -46,12 +46,13 @@ add_task(function() {
// Remove non-existent directory with ignoreAbsent
yield OS.File.removeDir(dir, {ignoreAbsent: true});
yield OS.File.removeDir(dir);
// Remove file
// Remove file with ignoreAbsent: false
yield OS.File.writeAtomic(file, "content", { tmpPath: file + ".tmp" });
exception = null;
try {
yield OS.File.removeDir(file);
yield OS.File.removeDir(file, {ignoreAbsent: false});
} catch (ex) {
exception = ex;
}
@ -67,15 +68,14 @@ add_task(function() {
// Remove directory that contains one file
yield OS.File.makeDir(dir);
yield OS.File.writeAtomic(file1, "content", { tmpPath: file1 + ".tmp" });
//yield OS.File.open(file1, {create:true});
yield OS.File.removeDir(dir)
yield OS.File.removeDir(dir);
do_check_false((yield OS.File.exists(dir)));
// Remove directory that contains multiple files
yield OS.File.makeDir(dir);
yield OS.File.writeAtomic(file1, "content", { tmpPath: file1 + ".tmp" });
yield OS.File.writeAtomic(file2, "content", { tmpPath: file2 + ".tmp" });
yield OS.File.removeDir(dir)
yield OS.File.removeDir(dir);
do_check_false((yield OS.File.exists(dir)));
// Remove directory that contains a file and a directory