diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-24 10:53:40 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:23 +0200 |
commit | 210feb6cc484a6c5c63c98f770de34e223f944cb (patch) | |
tree | d1d841892a7ac87ac0d434194597606a375aaed1 /server/tests/api/activitypub | |
parent | 9cc8d43e37a61709e7275c2a799bdf976dd940ca (diff) | |
download | PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.gz PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.zst PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.zip |
Cleanup tests
Diffstat (limited to 'server/tests/api/activitypub')
-rw-r--r-- | server/tests/api/activitypub/client.ts | 4 | ||||
-rw-r--r-- | server/tests/api/activitypub/fetch.ts | 5 | ||||
-rw-r--r-- | server/tests/api/activitypub/refresher.ts | 2 | ||||
-rw-r--r-- | server/tests/api/activitypub/security.ts | 5 |
4 files changed, 2 insertions, 14 deletions
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 () { | |||
22 | before(async function () { | 22 | before(async function () { |
23 | this.timeout(30000) | 23 | this.timeout(30000) |
24 | 24 | ||
25 | await flushTests() | ||
26 | |||
27 | servers = await flushAndRunMultipleServers(2) | 25 | servers = await flushAndRunMultipleServers(2) |
28 | 26 | ||
29 | await setAccessTokensToServers(servers) | 27 | await setAccessTokensToServers(servers) |
@@ -61,7 +59,7 @@ describe('Test activitypub', function () { | |||
61 | expect(res.header.location).to.equal('http://localhost:9001/videos/watch/' + videoUUID) | 59 | expect(res.header.location).to.equal('http://localhost:9001/videos/watch/' + videoUUID) |
62 | }) | 60 | }) |
63 | 61 | ||
64 | after(async function () { | 62 | after(function () { |
65 | killallServers(servers) | 63 | killallServers(servers) |
66 | }) | 64 | }) |
67 | }) | 65 | }) |
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 () { | |||
81 | killallServers(servers) | 81 | killallServers(servers) |
82 | 82 | ||
83 | await closeAllSequelize(servers) | 83 | await closeAllSequelize(servers) |
84 | |||
85 | // Keep the logs if the test failed | ||
86 | if (this['ok']) { | ||
87 | await flushTests() | ||
88 | } | ||
89 | }) | 84 | }) |
90 | }) | 85 | }) |
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 () { | |||
153 | }) | 153 | }) |
154 | }) | 154 | }) |
155 | 155 | ||
156 | after(async function () { | 156 | after(function () { |
157 | killallServers(servers) | 157 | killallServers(servers) |
158 | }) | 158 | }) |
159 | }) | 159 | }) |
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 () { | |||
180 | killallServers(servers) | 180 | killallServers(servers) |
181 | 181 | ||
182 | await closeAllSequelize(servers) | 182 | await closeAllSequelize(servers) |
183 | |||
184 | // Keep the logs if the test failed | ||
185 | if (this['ok']) { | ||
186 | await flushTests() | ||
187 | } | ||
188 | }) | 183 | }) |
189 | }) | 184 | }) |