Skip to content

Make recursive rmdir more strict #35250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iansu wants to merge 6 commits into from
Closed

Make recursive rmdir more strict #35250

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02cee53
fs: throw in rmdir recursive if path does not exist or is not a direc…
iansu Sep 13, 2020
43c785e
Fix tests
iansu Sep 18, 2020
e26dbba
Improve test cleanup
iansu Sep 18, 2020
0eb9255
Fix tests
iansu Sep 23, 2020
7fb4613
Make sure stats exists before checking it
iansu Sep 23, 2020
523ec9b
Replace invalid argument error with custom error when target is not a…
iansu Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve test cleanup
  • Loading branch information
@iansu
iansu committed Sep 18, 2020
commit e26dbbaf2e50939a67da9b3f63c4ac11e547aa40
43 changes: 25 additions & 18 deletions test/parallel/test-fs-rmdir-recursive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ function removeAsync(dir) {
assert.strictEqual(err.code, 'ERR_INVALID_ARG_VALUE');
assert.strictEqual(err.name, 'TypeError');
assert.match(err.message, /^The argument 'path' is not a directory\./);
fs.unlinkSync(filePath);
Copy link
Copy Markdown
Member

@boneskull boneskull Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs a try/finally as well because these assert calls may throw

}));
fs.unlinkSync(filePath);
}

// Test the synchronous version.
Expand Down Expand Up @@ -147,15 +147,18 @@ function removeAsync(dir) {
const filePath = path.join(tmpdir.path, 'rmdir-sync-file.txt');
fs.writeFileSync(filePath, '');

assert.throws(() => {
fs.rmdirSync(filePath, { recursive: true });
}, {
code: 'ERR_INVALID_ARG_VALUE',
name: 'TypeError',
message: /^The argument 'path' is not a directory\./
});
try {
assert.throws(() => {
fs.rmdirSync(filePath, { recursive: true });
}, {
code: 'ERR_INVALID_ARG_VALUE',
name: 'TypeError',
message: /^The argument 'path' is not a directory\./
});
} finally {
fs.unlinkSync(filePath);
}

fs.unlinkSync(filePath);

// Recursive removal should succeed.
fs.rmdirSync(dir, { recursive: true });
Expand Down Expand Up @@ -189,17 +192,21 @@ function removeAsync(dir) {
});

// Should fail if target is a file
const filePath = path.join(tmpdir.path, 'rmdir-sync-file.txt');
const filePath = path.join(tmpdir.path, 'rmdir-promises-file.txt');
fs.writeFileSync(filePath, '');

assert.rejects(fs.promises.rmdir(
filePath,
{ recursive: true }
), {
code: 'ERR_INVALID_ARG_VALUE',
name: 'TypeError',
message: /^The argument 'path' is not a directory\./
});
try {
assert.rejects(fs.promises.rmdir(
filePath,
{ recursive: true }
), {
code: 'ERR_INVALID_ARG_VALUE',
name: 'TypeError',
message: /^The argument 'path' is not a directory\./
});
} finally {
fs.unlinkSync(filePath);
}

// Attempted removal should fail now because the directory is gone.
assert.rejects(fs.promises.rmdir(dir), { syscall: 'rmdir' });
Expand Down