Close mock blocklit server when tests end

diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts
index 3ec03d5587a12c031799c118c5260b4e0862e4fd..1b91d141e54bd0b81cd0a8a3eb679a50e5d388f7 100644 (file)
--- a/server/tests/external-plugins/auto-block-videos.ts
+++ b/server/tests/external-plugins/auto-block-videos.ts
@@ -185,6 +185,8 @@ describe('Official plugin auto-block videos', function () {
   })
 
   after(async function () {
+    await blocklistServer.terminate()
+
     await cleanupTests(servers)
   })
 })

diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts
index bfdbee80ad6253da3b68d387bcde339efc5ae69e..8ead34a2bfe5d0ab7f2e891716c142dbc387de3a 100644 (file)
--- a/server/tests/external-plugins/auto-mute.ts
+++ b/server/tests/external-plugins/auto-mute.ts
@@ -238,6 +238,8 @@ describe('Official plugin auto-mute', function () {
   })
 
   after(async function () {
+    await blocklistServer.terminate()
+
     await cleanupTests(servers)
   })
 })

diff --git a/shared/extra-utils/plugins/mock-blocklist.ts b/shared/extra-utils/plugins/mock-blocklist.ts
index 6fe3dee9f7341e1fedcb74d767c5a68f0bc59e40..07c8c512262a47138090286ee0f64adb05f44716 100644 (file)
--- a/shared/extra-utils/plugins/mock-blocklist.ts
+++ b/shared/extra-utils/plugins/mock-blocklist.ts
@@ -1,4 +1,5 @@
 import * as express from 'express'
+import { Server } from 'http'
 
 type BlocklistResponse = {
   data: {
@@ -10,6 +11,7 @@ type BlocklistResponse = {
 
 export class MockBlocklist {
   private body: BlocklistResponse
+  private server: Server
 
   initialize () {
     return new Promise(res => {
@@ -19,11 +21,15 @@ export class MockBlocklist {
         return res.json(this.body)
       })
 
-      app.listen(42100, () => res())
+      this.server = app.listen(42100, () => res())
     })
   }
 
   replace (body: BlocklistResponse) {
     this.body = body
   }
+
+  terminate () {
+    if (this.server) this.server.close()
+  }
 }