Skip to content

Commit 1adad89

Browse files
committed
test: retry rmSync teardown to fix ENOTEMPTY flake in server e2e
Server children can still be writing when afterEach removes the temp home; rmSync's maxRetries/retryDelay absorbs the race instead of failing the suite (seen on approval.e2e.test.ts in CI).
1 parent 29413ef commit 1adad89

40 files changed

Lines changed: 77 additions & 77 deletions

packages/server-e2e/test/report.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const tmpDirs: string[] = [];
2424

2525
afterEach(() => {
2626
for (const dir of tmpDirs.splice(0)) {
27-
rmSync(dir, { recursive: true, force: true });
27+
rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
2828
}
2929
});
3030

packages/server/test/approval.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ afterEach(async () => {
5959
// ignore
6060
}
6161
server = undefined;
62-
rmSync(tmpDir, { recursive: true, force: true });
63-
rmSync(bridgeHome, { recursive: true, force: true });
62+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
63+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
6464
});
6565

6666
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/auth.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ afterEach(async () => {
5151
// ignore
5252
}
5353
server = undefined;
54-
rmSync(tmpDir, { recursive: true, force: true });
55-
rmSync(bridgeHome, { recursive: true, force: true });
54+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
55+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5656
});
5757

5858
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/config.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ afterEach(async () => {
2525
// ignore
2626
}
2727
server = undefined;
28-
rmSync(tmpDir, { recursive: true, force: true });
29-
rmSync(bridgeHome, { recursive: true, force: true });
28+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
29+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
3030
});
3131

3232
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/connections.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ afterEach(async () => {
5050
// ignore
5151
}
5252
}
53-
rmSync(tmpDir, { recursive: true, force: true });
54-
rmSync(bridgeHome, { recursive: true, force: true });
53+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
54+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5555
});
5656

5757
async function spawn(): Promise<RunningServer> {

packages/server/test/files.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ afterEach(async () => {
4747
// ignore
4848
}
4949
server = undefined;
50-
rmSync(tmpDir, { recursive: true, force: true });
51-
rmSync(bridgeHome, { recursive: true, force: true });
50+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
51+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5252
});
5353

5454
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/fs-basic.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ afterEach(async () => {
5050
// ignore
5151
}
5252
server = undefined;
53-
rmSync(tmpDir, { recursive: true, force: true });
54-
rmSync(bridgeHome, { recursive: true, force: true });
53+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
54+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5555
});
5656

5757
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/fs-batch.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ afterEach(async () => {
5050
// ignore
5151
}
5252
server = undefined;
53-
rmSync(tmpDir, { recursive: true, force: true });
54-
rmSync(bridgeHome, { recursive: true, force: true });
53+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
54+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5555
});
5656

5757
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/fs-browse.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ afterEach(async () => {
4949
} catch {
5050
// ignore — fixture may not exist
5151
}
52-
rmSync(tmpDir, { recursive: true, force: true });
53-
rmSync(bridgeHome, { recursive: true, force: true });
52+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
53+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5454
});
5555

5656
async function bootDaemon(): Promise<RunningServer> {

packages/server/test/fs-download.e2e.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ afterEach(async () => {
5252
// ignore
5353
}
5454
server = undefined;
55-
rmSync(tmpDir, { recursive: true, force: true });
56-
rmSync(bridgeHome, { recursive: true, force: true });
55+
rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
56+
rmSync(bridgeHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
5757
});
5858

5959
async function bootDaemon(): Promise<RunningServer> {

0 commit comments

Comments
 (0)