fixes to tests for win

Author: gmaclennan

src/reader-watch.js

@@ -19,13 +19,13 @@ export function createReaderWatch(filePath, { signal } = {}) {
 	const watcher = fs.watch(
 		dir,
 		{ signal, persistent: false },
-		(_, filename) => {
+		async (_, filename) => {
 			console.log(`File change '${_}' detected: ${filename}`)
 			// If filename is null (which can happen on some platforms), or if the
 			// changed file is the one we're watching, then we re-create the reader
 			if (filename && filename !== path.basename(filePath)) return
 			signal?.removeEventListener('abort', readerClose)
-			readerClose()
+			await readerClose()
 			;({ reader, readerClose } = initializeReader())
 		},
 	)

test/reader-watch.test.js

@@ -105,7 +105,7 @@ test('createReaderWatch - file is deleted', async (t) => {
 	)
 
 	// Delete the file
-	fs.unlinkSync(targetPath)
+	fs.rmSync(targetPath, { force: true, maxRetries: 5 })
 	await syncDir(dir)
 
 	const reader2 = getReader()
@@ -307,5 +307,9 @@ async function syncDir(dirPath) {
 
 /** @param {string} dirPath */
 async function rmDir(dirPath) {
+	if (isWin) {
+		// On Windows, sometimes immediate removal fails due to file locks
+		await setTimeout(200)
+	}
 	await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 5 })
 }