From 210feb6cc484a6c5c63c98f770de34e223f944cb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 24 Apr 2019 10:53:40 +0200
Subject: Cleanup tests

---
 server/tests/api/activitypub/client.ts    | 4 +---
 server/tests/api/activitypub/fetch.ts     | 5 -----
 server/tests/api/activitypub/refresher.ts | 2 +-
 server/tests/api/activitypub/security.ts  | 5 -----
 4 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'server/tests/api/activitypub')

diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts
index 52e7e27f8..edf588c16 100644
--- a/server/tests/api/activitypub/client.ts
+++ b/server/tests/api/activitypub/client.ts
@@ -22,8 +22,6 @@ describe('Test activitypub', function () {
   before(async function () {
     this.timeout(30000)
 
-    await flushTests()
-
     servers = await flushAndRunMultipleServers(2)
 
     await setAccessTokensToServers(servers)
@@ -61,7 +59,7 @@ describe('Test activitypub', function () {
     expect(res.header.location).to.equal('http://localhost:9001/videos/watch/' + videoUUID)
   })
 
-  after(async function () {
+  after(function () {
     killallServers(servers)
   })
 })
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index f9dba3418..7240bb0fb 100644
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -81,10 +81,5 @@ describe('Test ActivityPub fetcher', function () {
     killallServers(servers)
 
     await closeAllSequelize(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts
index 7b08b1dab..9be9aa495 100644
--- a/server/tests/api/activitypub/refresher.ts
+++ b/server/tests/api/activitypub/refresher.ts
@@ -153,7 +153,7 @@ describe('Test AP refresher', function () {
     })
   })
 
-  after(async function () {
+  after(function () {
     killallServers(servers)
   })
 })
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index 2346e9c8e..11e6859bf 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -180,10 +180,5 @@ describe('Test ActivityPub security', function () {
     killallServers(servers)
 
     await closeAllSequelize(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })
-- 
cgit v1.2.3