Skip to content

fs: stop fixing EPERM on Windows #38810

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
RaisinTen wants to merge 20 commits into from
Closed

fs: stop fixing EPERM on Windows #38810

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8186ba4
fs: stop fixing EPERM on Windows
RaisinTen May 25, 2021
abdadd3
move checks into functions
RaisinTen Jun 3, 2021
ea8e0a5
reindent
RaisinTen Jun 3, 2021
9596fdc
update comments
RaisinTen Jun 3, 2021
8975f3e
tmpdir: remove empty call
RaisinTen Jun 3, 2021
aedf3a9
fixup! tmpdir: remove empty call
RaisinTen Jun 3, 2021
838cad0
lint fix
RaisinTen Jun 3, 2021
ecac8c6
Apply suggestions from code review
RaisinTen Jun 3, 2021
f48b819
Apply suggestions from code review
RaisinTen Jun 3, 2021
f67b959
Apply suggestions from code review
RaisinTen Jun 3, 2021
d4e6c6e
lint fix
RaisinTen Jun 3, 2021
3e52248
Apply suggestions from code review
RaisinTen Jun 4, 2021
bd817e2
Apply suggestions from code review
RaisinTen Jun 4, 2021
d0173e5
tmpdir: remove `if` around `throw err`
RaisinTen Jun 4, 2021
e88bdbb
Apply suggestions from code review
RaisinTen Jun 5, 2021
a766a75
tmpdir: inline error logging function
RaisinTen Jun 5, 2021
8c76097
use InvalidStateError class
RaisinTen Jun 5, 2021
65657f2
isValidState -> validateState
RaisinTen Jun 5, 2021
befac4b
log error from tmpdir only once at max
RaisinTen Jun 7, 2021
3fe174f
||= ~> if
RaisinTen Jun 7, 2021
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
use InvalidStateError class
  • Loading branch information
@RaisinTen
RaisinTen committed Jun 5, 2021
commit 8c76097a2a4aec5271a241672ab51469e71b712f
23 changes: 11 additions & 12 deletions test/parallel/test-fs-rm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,13 @@ function removeAsync(dir) {
// IBMi has a different access permission mechanism
// This test should not be run as `root`
if (!common.isIBMi && (common.isWindows || process.getuid() !== 0)) {
class InvalidStateError extends Error {
constructor(err) {
super('Invalid state');
this.cause = err;
}
}

// Check that deleting a file that cannot be accessed using rmsync throws:
// https://github.com/nodejs/node/issues/38683
{
Expand Down Expand Up @@ -319,9 +326,7 @@ function removeAsync(dir) {
try { fs.chmodSync(filePath, 0o777); } catch {}

if (!isValidState(fs.existsSync(filePath), err)) {
const e = new Error('Invalid state');
e.cause = err;
throw e;
throw new InvalidStateError(err);
}
}

Expand All @@ -340,9 +345,7 @@ function removeAsync(dir) {
try { fs.chmodSync(filePath, 0o777); } catch {}

if (!isValidState(fs.existsSync(filePath), err)) {
const e = new Error('Invalid state');
e.cause = err;
throw e;
throw new InvalidStateError(err);
}
}));
}
Expand Down Expand Up @@ -384,9 +387,7 @@ function removeAsync(dir) {
try { fs.chmodSync(leaf, 0o777); } catch {}

if (!isValidState(fs.existsSync(root), err)) {
const e = new Error('Invalid state');
e.cause = err;
throw e;
throw new InvalidStateError(err);
}
}

Expand All @@ -408,9 +409,7 @@ function removeAsync(dir) {
try { fs.chmodSync(leaf, 0o777); } catch {}

if (!isValidState(fs.existsSync(root), err)) {
const e = new Error('Invalid state');
e.cause = err;
throw e;
throw new InvalidStateError(err);
}
}));
}
Expand Down