fs: fix rmsync error swallowing

fix rmsync swallowing errors instead of throwing them.
fixes: #38683fixes: #34580
PR-URL: #38684Fixes: #38683Fixes: #34580
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: Linkgoron

lib/internal/fs/rimraf.js

@@ -219,6 +219,11 @@ function _unlinkSync(path, options) {
 i<tries&&
 options.retryDelay>0){
 sleep(i*options.retryDelay);
+}elseif(err.code==='ENOENT'){
+// The file is already gone.
+return;
+}elseif(i===tries){
+throwerr;
 }
 }
 }
@@ -231,8 +236,9 @@ function _rmdirSync(path, options, originalErr) {
 }catch(err){
 if(err.code==='ENOENT')
 return;
-if(err.code==='ENOTDIR')
-throworiginalErr;
+if(err.code==='ENOTDIR'){
+throworiginalErr||err;
+}
 
 if(notEmptyErrorCodes.has(err.code)){
 // Removing failed. Try removing all children and then retrying the
@@ -259,10 +265,17 @@ function _rmdirSync(path, options, originalErr) {
 i<tries&&
 options.retryDelay>0){
 sleep(i*options.retryDelay);
+}elseif(err.code==='ENOENT'){
+// The file is already gone.
+return;
+}elseif(i===tries){
+throwerr;
 }
 }
 }
 }
+
+throworiginalErr||err;
 }
 }
 

test/parallel/test-fs-mkdir-recursive-eaccess.js

@@ -26,8 +26,7 @@ function makeDirectoryReadOnly(dir) {
 letaccessErrorCode='EACCES';
 if(common.isWindows){
 accessErrorCode='EPERM';
-execSync(`icacls ${dir} /inheritance:r`);
-execSync(`icacls ${dir} /deny "everyone":W`);
+execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(DE,DC,AD,WD)"`);
 }else{
 fs.chmodSync(dir,'444');
 }
@@ -36,7 +35,7 @@ function makeDirectoryReadOnly(dir) {
 
 functionmakeDirectoryWritable(dir){
 if(common.isWindows){
-execSync(`icacls ${dir} /grant "everyone":W`);
+execSync(`icacls ${dir} /remove:d "everyone"`);
 }
 }
 

test/parallel/test-fs-open-no-close.js

@@ -15,10 +15,17 @@ const debuglog = (arg) => {
 consttmpdir=require('../common/tmpdir');
 tmpdir.refresh();
 
-{
-fs.open(`${tmpdir.path}/dummy`,'wx+',common.mustCall((err,fd)=>{
-debuglog('fs open() callback');
-assert.ifError(err);
-}));
-debuglog('waiting for callback');
-}
+letopenFd;
+
+fs.open(`${tmpdir.path}/dummy`,'wx+',common.mustCall((err,fd)=>{
+debuglog('fs open() callback');
+assert.ifError(err);
+openFd=fd;
+}));
+debuglog('waiting for callback');
+
+process.on('beforeExit',common.mustCall(()=>{
+if(openFd){
+fs.closeSync(openFd);
+}
+}));

test/parallel/test-fs-promises-file-handle-read-worker.js

@@ -19,16 +19,20 @@ if (isMainThread || !workerData) {
 transferList: [handle]
 });
 });
-fs.promises.open(file,'r').then((handle)=>{
-fs.createReadStream(null,{fd: handle});
-assert.throws(()=>{
-newWorker(__filename,{
-workerData: { handle },
-transferList: [handle]
+fs.promises.open(file,'r').then(async(handle)=>{
+try{
+fs.createReadStream(null,{fd: handle});
+assert.throws(()=>{
+newWorker(__filename,{
+workerData: { handle },
+transferList: [handle]
+});
+},{
+code: 25,
 });
-},{
-code: 25,
-});
+}finally{
+awaithandle.close();
+}
 });
 }else{
 letoutput='';

test/parallel/test-fs-promises-file-handle-readFile.js

@@ -56,13 +56,16 @@ async function doReadAndCancel() {
 {
 constfilePathForHandle=path.resolve(tmpDir,'dogs-running.txt');
 constfileHandle=awaitopen(filePathForHandle,'w+');
-constbuffer=Buffer.from('Dogs running'.repeat(10000),'utf8');
-fs.writeFileSync(filePathForHandle,buffer);
-constsignal=AbortSignal.abort();
-awaitassert.rejects(readFile(fileHandle,{ signal }),{
-name: 'AbortError'
-});
-awaitfileHandle.close();
+try{
+constbuffer=Buffer.from('Dogs running'.repeat(10000),'utf8');
+fs.writeFileSync(filePathForHandle,buffer);
+constsignal=AbortSignal.abort();
+awaitassert.rejects(readFile(fileHandle,{ signal }),{
+name: 'AbortError'
+});
+}finally{
+awaitfileHandle.close();
+}
 }
 
 // Signal aborted on first tick

test/parallel/test-fs-promises-file-handle-writeFile.js

@@ -30,13 +30,17 @@ async function validateWriteFile() {
 asyncfunctiondoWriteAndCancel(){
 constfilePathForHandle=path.resolve(tmpDir,'dogs-running.txt');
 constfileHandle=awaitopen(filePathForHandle,'w+');
-constbuffer=Buffer.from('dogs running'.repeat(512*1024),'utf8');
-constcontroller=newAbortController();
-const{ signal }=controller;
-process.nextTick(()=>controller.abort());
-awaitassert.rejects(writeFile(fileHandle,buffer,{ signal }),{
-name: 'AbortError'
-});
+try{
+constbuffer=Buffer.from('dogs running'.repeat(512*1024),'utf8');
+constcontroller=newAbortController();
+const{ signal }=controller;
+process.nextTick(()=>controller.abort());
+awaitassert.rejects(writeFile(fileHandle,buffer,{ signal }),{
+name: 'AbortError'
+});
+}finally{
+awaitfileHandle.close();
+}
 }
 
 validateWriteFile()