1 files changed, 11 insertions, 2 deletions
diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts
index 1e9c83c72..bde7dd5c2 100644
--- a/shared/utils/server/servers.ts
+++ b/shared/utils/server/servers.ts
@@ -146,7 +146,11 @@ function runServer (serverNumber: number, configOverride?: Object, args = []) {
      server.app.stdout.removeListener('data', onStdout)
-      process.on('exit', () => process.kill(server.app.pid))
+      process.on('exit', () => {
+        try {
+          process.kill(server.app.pid)
+        } catch { /* empty */ }
+      })
      res(server)
    })
@@ -162,9 +166,13 @@ async function reRunServer (server: ServerInfo, configOverride?: any) {
 }
 async function checkTmpIsEmpty (server: ServerInfo) {
+  return checkDirectoryIsEmpty(server, 'tmp')
+}
+async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) {
  const testDirectory = 'test' + server.serverNumber
-  const directoryPath = join(root(), testDirectory, 'tmp')
+  const directoryPath = join(root(), testDirectory, directory)
  const directoryExists = existsSync(directoryPath)
  expect(directoryExists).to.be.true
@@ -195,6 +203,7 @@ async function waitUntilLog (server: ServerInfo, str: string, count = 1) {
 // ---------------------------------------------------------------------------
 export {
+  checkDirectoryIsEmpty,
  checkTmpIsEmpty,
  ServerInfo,
  flushAndRunMultipleServers,