From edbb9c1ea71e41907b0795192742d9bb6fa09994 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Sun, 1 May 2022 15:39:34 -0700 Subject: [PATCH] Revert "server: tests: remove db cleanup workaround" This reverts commit 365d82755f650b7c94dc3e0075a868cd92143609. --- scripts/testsetup.js | 6 +++++- server/.jest/auth.setup.js | 6 +++++- server/.jest/rtorrent.setup.js | 6 +++++- server/.jest/transmission.setup.js | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/testsetup.js b/scripts/testsetup.js index 1d540479..ccfad7b2 100644 --- a/scripts/testsetup.js +++ b/scripts/testsetup.js @@ -49,7 +49,11 @@ const startFlood = () => { const closeProcesses = () => { floodProcess.on('close', () => { - fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + if (process.env.CI !== 'true') { + // TODO: This leads to test flakiness caused by ENOENT error + // NeDB provides no method to close database connection + fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + } }); floodProcess.kill('SIGTERM'); diff --git a/server/.jest/auth.setup.js b/server/.jest/auth.setup.js index d842d053..9fbc256e 100644 --- a/server/.jest/auth.setup.js +++ b/server/.jest/auth.setup.js @@ -11,5 +11,9 @@ process.argv.push('--auth', 'default'); process.argv.push('--assets', 'false'); afterAll(() => { - fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + if (process.env.CI !== 'true') { + // TODO: This leads to test flakiness caused by ENOENT error + // NeDB provides no method to close database connection + fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + } }); diff --git a/server/.jest/rtorrent.setup.js b/server/.jest/rtorrent.setup.js index 10ea6d75..16de9c0c 100644 --- a/server/.jest/rtorrent.setup.js +++ b/server/.jest/rtorrent.setup.js @@ -31,6 +31,10 @@ process.argv.push('--assets', 'false'); afterAll((done) => { process.kill(Number(fs.readFileSync(`${temporaryRuntimeDirectory}/rtorrent.pid`).toString())); - fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + if (process.env.CI !== 'true') { + // TODO: This leads to test flakiness caused by ENOENT error + // NeDB provides no method to close database connection + fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + } done(); }); diff --git a/server/.jest/transmission.setup.js b/server/.jest/transmission.setup.js index 1fc36ad7..cbcd9b8c 100644 --- a/server/.jest/transmission.setup.js +++ b/server/.jest/transmission.setup.js @@ -43,7 +43,11 @@ process.argv.push('--assets', 'false'); afterAll((done) => { transmissionProcess.on('close', () => { - fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + if (process.env.CI !== 'true') { + // TODO: This leads to test flakiness caused by ENOENT error + // NeDB provides no method to close database connection + fs.rmdirSync(temporaryRuntimeDirectory, {recursive: true}); + } done(); });