From 7c6141f54d82ff68bcf223936b1488d67eaa67d0 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 22 Sep 2023 13:53:47 +0200 Subject: [PATCH] backend-test-utils: use built-in rmSync retries in MockDirectory Signed-off-by: Patrik Oldsberg --- .../src/filesystem/MockDirectory.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/backend-test-utils/src/filesystem/MockDirectory.ts b/packages/backend-test-utils/src/filesystem/MockDirectory.ts index 809fd5ddf7..499c7f29fb 100644 --- a/packages/backend-test-utils/src/filesystem/MockDirectory.ts +++ b/packages/backend-test-utils/src/filesystem/MockDirectory.ts @@ -28,7 +28,6 @@ import { win32, posix, } from 'path'; -import { isError } from '@backstage/errors'; /** * The content of a mock directory represented by a nested object structure. @@ -331,16 +330,7 @@ export class MockDirectory { * Removes the mock directory and all its contents. */ remove = (): void => { - try { - fs.rmSync(this.#root, { recursive: true, force: true }); - } catch (error: unknown) { - if (isError(error) && error.code === 'ENOTEMPTY') { - // Windows can be a bit flaky, give it another go - fs.rmSync(this.#root, { recursive: true, force: true }); - } else { - throw error; - } - } + fs.rmSync(this.#root, { recursive: true, force: true, maxRetries: 3 }); }; #transformInput(input: MockDirectoryContent[string]): MockEntry[] {