fixup! fixup! fixup! fixup! fs: fix rmsync error swallowing

nodejs · May 16, 2021 · d515441 · d515441
1 parent 7448ad0
commit d515441
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/test/parallel/test-fs-rm.js b/test/parallel/test-fs-rm.js
@@ -284,22 +284,23 @@ 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)) {
     function makeDirectoryReadOnly(dir) {
       let accessErrorCode = '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)"`);
       } else {
-        fs.chmodSync(dir, '444');
+        fs.chmodSync(dir, 0o444);
       }
       return accessErrorCode;
     }
 
     function makeDirectoryWritable(dir) {
       if (common.isWindows) {
-        execSync(`icacls ${dir} /grant "everyone":W`);
+        execSync(`icacls ${dir} /remove:d "everyone"`);
       } else {
         fs.chmodSync(dirname, 0o777);
       }
@@ -311,11 +312,11 @@ function removeAsync(dir) {
     try {
       fs.mkdirSync(dirname, { recursive: true });
       fs.writeFileSync(filePath, 'hello');
-      const errorCode = makeDirectoryReadOnly(dirname);
+      const code = makeDirectoryReadOnly(dirname);
       assert.throws(() => {
         fs.rmSync(filePath, { force: true });
       }, {
-        code: errorCode,
+        code,
         name: 'Error',
       });
     } finally {