test: work around ENOTEMPTY when cleaning tmp dir

Replace the homegrown rimrafsync implementation in test/common with a call to `fs.rmdirSync(path,{recursive: true })`. Fixes: #30620Fixes: #30844 PR-URL: #30849 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: bnoordhuis

test/async-hooks/test-pipeconnectwrap.js

@@ -8,8 +8,7 @@ const{checkInvocations } = require('./hook-checks');
 consttmpdir=require('../common/tmpdir');
 constnet=require('net');
 
-// Spawning messes up `async_hooks` state.
-tmpdir.refresh({spawn: false});
+tmpdir.refresh();
 
 consthooks=initHooks();
 hooks.enable();

test/async-hooks/test-statwatcher.js

@@ -11,7 +11,7 @@ const path = require('path');
 if(!common.isMainThread)
 common.skip('Worker bootstrapping works differently -> different async IDs');
 
-tmpdir.refresh({spawn: false});
+tmpdir.refresh();
 
 constfile1=path.join(tmpdir.path,'file1');
 constfile2=path.join(tmpdir.path,'file2');

test/common/README.md

@@ -898,11 +898,7 @@ The `tmpdir` module supports the use of a temporary directory for testing.
 
 The realpath of the testing temporary directory.
 
-### refresh(\[opts\])
-
-*`opts`[<Object>][] (optional) Extra options.
-*`spawn`[<boolean>][] (default: `true`) Indicates that `refresh` is
- allowed to optionally spawn a subprocess.
+### refresh()
 
 Deletes and recreates the testing temporary directory.
 

test/common/tmpdir.js

@@ -1,41 +1,11 @@
 /* eslint-disable node-core/require-common-first, node-core/required-modules */
 'use strict';
 
-const{ execSync }=require('child_process');
 constfs=require('fs');
 constpath=require('path');
-const{ debuglog }=require('util');
 
-constdebug=debuglog('test/tmpdir');
-
-functionrimrafSync(pathname,{ spawn =true}={}){
-constst=(()=>{
-try{
-returnfs.lstatSync(pathname);
-}catch(e){
-if(fs.existsSync(pathname))
-thrownewError(`Something wonky happened rimrafing ${pathname}`);
-debug(e);
-}
-})();
-
-// If (!st) then nothing to do.
-if(!st){
-return;
-}
-
-// On Windows first try to delegate rmdir to a shell.
-if(spawn&&process.platform==='win32'&&st.isDirectory()){
-try{
-// Try `rmdir` first.
-execSync(`rmdir /q /s ${pathname}`,{timeout: 1000});
-}catch(e){
-// Attempt failed. Log and carry on.
-debug(e);
-}
-}
-
-fs.rmdirSync(pathname,{recursive: true,maxRetries: 5});
+functionrimrafSync(pathname){
+fs.rmdirSync(pathname,{maxRetries: 3,recursive: true});
 }
 
 consttestRoot=process.env.NODE_TEST_DIR ?
@@ -46,8 +16,8 @@ const testRoot = process.env.NODE_TEST_DIR ?
 consttmpdirName='.tmp.'+(process.env.TEST_THREAD_ID||'0');
 consttmpPath=path.join(testRoot,tmpdirName);
 
-functionrefresh(opts={}){
-rimrafSync(this.path,opts);
+functionrefresh(){
+rimrafSync(this.path);
 fs.mkdirSync(this.path);
 }
 

test/parallel/parallel.status

@@ -11,8 +11,6 @@ test-fs-stat-bigint: PASS,FLAKY
 test-net-connect-options-port: PASS,FLAKY
 
 [$system==win32]
-# https://github.com/nodejs/node/issues/30620
-test-child-process-fork-exec-path: PASS,FLAKY
 # https://github.com/nodejs/node/issues/20750
 test-http2-client-upload: PASS,FLAKY
 # https://github.com/nodejs/node/issues/20750
@@ -23,8 +21,6 @@ test-http2-compat-client-upload-reject: PASS,FLAKY
 test-http2-multistream-destroy-on-read-tls: PASS,FLAKY
 # https://github.com/nodejs/node/issues/20750
 test-http2-pipe: PASS,FLAKY
-# https://github.com/nodejs/node/issues/30844
-test-module-loading-globalpaths: PASS,FLAKY
 # https://github.com/nodejs/node/issues/23277
 test-worker-memory: PASS,FLAKY
 # https://github.com/nodejs/node/issues/30846