diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-22 09:20:28 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-05-22 09:22:08 +0200 |
commit | 33b91e53d21fba295ecf516b717fb36e91990771 (patch) | |
tree | c3e6c31636a47b64c164c1e91ee2125bbc61339e | |
parent | 679f8800cdc0ef925fae9ca26fb2892a8f475ad5 (diff) | |
download | PeerTube-33b91e53d21fba295ecf516b717fb36e91990771.tar.gz PeerTube-33b91e53d21fba295ecf516b717fb36e91990771.tar.zst PeerTube-33b91e53d21fba295ecf516b717fb36e91990771.zip |
Remove low timeouts
Default timeout is 30s
32 files changed, 2 insertions, 162 deletions
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 6c48b7ac8..4ea7929ec 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts | |||
@@ -150,8 +150,6 @@ describe('Test AP refresher', function () { | |||
150 | }) | 150 | }) |
151 | 151 | ||
152 | after(async function () { | 152 | after(async function () { |
153 | this.timeout(10000) | ||
154 | |||
155 | await sqlCommandServer2.cleanup() | 153 | await sqlCommandServer2.cleanup() |
156 | 154 | ||
157 | await cleanupTests(servers) | 155 | await cleanupTests(servers) |
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts index 6cf504f6f..31ebc89b4 100644 --- a/server/tests/api/activitypub/security.ts +++ b/server/tests/api/activitypub/security.ts | |||
@@ -220,8 +220,6 @@ describe('Test ActivityPub security', function () { | |||
220 | 220 | ||
221 | describe('When checking Linked Data Signature', function () { | 221 | describe('When checking Linked Data Signature', function () { |
222 | before(async function () { | 222 | before(async function () { |
223 | this.timeout(10000) | ||
224 | |||
225 | await setKeysOfServer(sqlCommands[0], servers[1].url, keys.publicKey, keys.privateKey) | 223 | await setKeysOfServer(sqlCommands[0], servers[1].url, keys.publicKey, keys.privateKey) |
226 | await setKeysOfServer(sqlCommands[1], servers[1].url, keys.publicKey, keys.privateKey) | 224 | await setKeysOfServer(sqlCommands[1], servers[1].url, keys.publicKey, keys.privateKey) |
227 | await setKeysOfServer(sqlCommands[2], servers[2].url, keys.publicKey, keys.privateKey) | 225 | await setKeysOfServer(sqlCommands[2], servers[2].url, keys.publicKey, keys.privateKey) |
@@ -232,8 +230,6 @@ describe('Test ActivityPub security', function () { | |||
232 | }) | 230 | }) |
233 | 231 | ||
234 | it('Should fail with bad keys', async function () { | 232 | it('Should fail with bad keys', async function () { |
235 | this.timeout(10000) | ||
236 | |||
237 | await setKeysOfServer(sqlCommands[0], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) | 233 | await setKeysOfServer(sqlCommands[0], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) |
238 | await setKeysOfServer(sqlCommands[2], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) | 234 | await setKeysOfServer(sqlCommands[2], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) |
239 | 235 | ||
@@ -254,8 +250,6 @@ describe('Test ActivityPub security', function () { | |||
254 | }) | 250 | }) |
255 | 251 | ||
256 | it('Should fail with an altered body', async function () { | 252 | it('Should fail with an altered body', async function () { |
257 | this.timeout(10000) | ||
258 | |||
259 | await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) | 253 | await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) |
260 | await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) | 254 | await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) |
261 | 255 | ||
@@ -278,8 +272,6 @@ describe('Test ActivityPub security', function () { | |||
278 | }) | 272 | }) |
279 | 273 | ||
280 | it('Should succeed with a valid signature', async function () { | 274 | it('Should succeed with a valid signature', async function () { |
281 | this.timeout(10000) | ||
282 | |||
283 | const body = getAnnounceWithoutContext(servers[1]) | 275 | const body = getAnnounceWithoutContext(servers[1]) |
284 | body.actor = servers[2].url + '/accounts/peertube' | 276 | body.actor = servers[2].url + '/accounts/peertube' |
285 | 277 | ||
diff --git a/server/tests/api/check-params/plugins.ts b/server/tests/api/check-params/plugins.ts index 02f0d010d..e08cd7ab8 100644 --- a/server/tests/api/check-params/plugins.ts +++ b/server/tests/api/check-params/plugins.ts | |||
@@ -466,8 +466,6 @@ describe('Test server plugins API validators', function () { | |||
466 | }) | 466 | }) |
467 | 467 | ||
468 | it('Should succeed with the correct parameters', async function () { | 468 | it('Should succeed with the correct parameters', async function () { |
469 | this.timeout(10000) | ||
470 | |||
471 | const it = [ | 469 | const it = [ |
472 | { suffix: 'install', status: HttpStatusCode.OK_200 }, | 470 | { suffix: 'install', status: HttpStatusCode.OK_200 }, |
473 | { suffix: 'update', status: HttpStatusCode.OK_200 }, | 471 | { suffix: 'update', status: HttpStatusCode.OK_200 }, |
diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts index 72c25ba33..b04d30b7f 100644 --- a/server/tests/api/check-params/search.ts +++ b/server/tests/api/check-params/search.ts | |||
@@ -219,8 +219,6 @@ describe('Test videos API validator', function () { | |||
219 | describe('Search target', function () { | 219 | describe('Search target', function () { |
220 | 220 | ||
221 | it('Should fail/succeed depending on the search target', async function () { | 221 | it('Should fail/succeed depending on the search target', async function () { |
222 | this.timeout(10000) | ||
223 | |||
224 | const query = { search: 'coucou' } | 222 | const query = { search: 'coucou' } |
225 | const paths = [ | 223 | const paths = [ |
226 | '/api/v1/search/video-playlists/', | 224 | '/api/v1/search/video-playlists/', |
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 592548b52..65ebbc5f7 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -181,8 +181,6 @@ describe('Test live', function () { | |||
181 | }) | 181 | }) |
182 | 182 | ||
183 | it('Should update the live', async function () { | 183 | it('Should update the live', async function () { |
184 | this.timeout(10000) | ||
185 | |||
186 | await commands[0].update({ videoId: liveVideoUUID, fields: { saveReplay: false, latencyMode: LiveVideoLatencyMode.DEFAULT } }) | 184 | await commands[0].update({ videoId: liveVideoUUID, fields: { saveReplay: false, latencyMode: LiveVideoLatencyMode.DEFAULT } }) |
187 | await waitJobs(servers) | 185 | await waitJobs(servers) |
188 | }) | 186 | }) |
@@ -206,8 +204,6 @@ describe('Test live', function () { | |||
206 | }) | 204 | }) |
207 | 205 | ||
208 | it('Delete the live', async function () { | 206 | it('Delete the live', async function () { |
209 | this.timeout(10000) | ||
210 | |||
211 | await servers[0].videos.remove({ id: liveVideoUUID }) | 207 | await servers[0].videos.remove({ id: liveVideoUUID }) |
212 | await waitJobs(servers) | 208 | await waitJobs(servers) |
213 | }) | 209 | }) |
diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts index d9c164c43..9fc296ea8 100644 --- a/server/tests/api/moderation/abuses.ts +++ b/server/tests/api/moderation/abuses.ts | |||
@@ -124,8 +124,6 @@ describe('Test abuses', function () { | |||
124 | }) | 124 | }) |
125 | 125 | ||
126 | it('Should report abuse on a remote video', async function () { | 126 | it('Should report abuse on a remote video', async function () { |
127 | this.timeout(10000) | ||
128 | |||
129 | const reason = 'my super bad reason 2' | 127 | const reason = 'my super bad reason 2' |
130 | const videoId = await servers[0].videos.getId({ uuid: servers[1].store.videoCreated.uuid }) | 128 | const videoId = await servers[0].videos.getId({ uuid: servers[1].store.videoCreated.uuid }) |
131 | await commands[0].report({ videoId, reason }) | 129 | await commands[0].report({ videoId, reason }) |
@@ -197,8 +195,6 @@ describe('Test abuses', function () { | |||
197 | }) | 195 | }) |
198 | 196 | ||
199 | it('Should hide video abuses from blocked accounts', async function () { | 197 | it('Should hide video abuses from blocked accounts', async function () { |
200 | this.timeout(10000) | ||
201 | |||
202 | { | 198 | { |
203 | const videoId = await servers[1].videos.getId({ uuid: servers[0].store.videoCreated.uuid }) | 199 | const videoId = await servers[1].videos.getId({ uuid: servers[0].store.videoCreated.uuid }) |
204 | await commands[1].report({ videoId, reason: 'will mute this' }) | 200 | await commands[1].report({ videoId, reason: 'will mute this' }) |
@@ -250,8 +246,6 @@ describe('Test abuses', function () { | |||
250 | }) | 246 | }) |
251 | 247 | ||
252 | it('Should keep the video abuse when deleting the video', async function () { | 248 | it('Should keep the video abuse when deleting the video', async function () { |
253 | this.timeout(10000) | ||
254 | |||
255 | await servers[1].videos.remove({ id: abuseServer2.video.uuid }) | 249 | await servers[1].videos.remove({ id: abuseServer2.video.uuid }) |
256 | 250 | ||
257 | await waitJobs(servers) | 251 | await waitJobs(servers) |
@@ -268,8 +262,6 @@ describe('Test abuses', function () { | |||
268 | }) | 262 | }) |
269 | 263 | ||
270 | it('Should include counts of reports from reporter and reportee', async function () { | 264 | it('Should include counts of reports from reporter and reportee', async function () { |
271 | this.timeout(10000) | ||
272 | |||
273 | // register a second user to have two reporters/reportees | 265 | // register a second user to have two reporters/reportees |
274 | const user = { username: 'user2', password: 'password' } | 266 | const user = { username: 'user2', password: 'password' } |
275 | await servers[0].users.create({ ...user }) | 267 | await servers[0].users.create({ ...user }) |
@@ -307,8 +299,6 @@ describe('Test abuses', function () { | |||
307 | }) | 299 | }) |
308 | 300 | ||
309 | it('Should list predefined reasons as well as timestamps for the reported video', async function () { | 301 | it('Should list predefined reasons as well as timestamps for the reported video', async function () { |
310 | this.timeout(10000) | ||
311 | |||
312 | const reason5 = 'my super bad reason 5' | 302 | const reason5 = 'my super bad reason 5' |
313 | const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ] | 303 | const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ] |
314 | const createRes = await commands[0].report({ | 304 | const createRes = await commands[0].report({ |
@@ -331,8 +321,6 @@ describe('Test abuses', function () { | |||
331 | }) | 321 | }) |
332 | 322 | ||
333 | it('Should delete the video abuse', async function () { | 323 | it('Should delete the video abuse', async function () { |
334 | this.timeout(10000) | ||
335 | |||
336 | await commands[1].delete({ abuseId: abuseServer2.id }) | 324 | await commands[1].delete({ abuseId: abuseServer2.id }) |
337 | 325 | ||
338 | await waitJobs(servers) | 326 | await waitJobs(servers) |
@@ -351,8 +339,6 @@ describe('Test abuses', function () { | |||
351 | }) | 339 | }) |
352 | 340 | ||
353 | it('Should list and filter video abuses', async function () { | 341 | it('Should list and filter video abuses', async function () { |
354 | this.timeout(10000) | ||
355 | |||
356 | async function list (query: Parameters<AbusesCommand['getAdminList']>[0]) { | 342 | async function list (query: Parameters<AbusesCommand['getAdminList']>[0]) { |
357 | const body = await commands[0].getAdminList(query) | 343 | const body = await commands[0].getAdminList(query) |
358 | 344 | ||
@@ -457,8 +443,6 @@ describe('Test abuses', function () { | |||
457 | }) | 443 | }) |
458 | 444 | ||
459 | it('Should report abuse on a remote comment', async function () { | 445 | it('Should report abuse on a remote comment', async function () { |
460 | this.timeout(10000) | ||
461 | |||
462 | const comment = await getComment(servers[0], servers[1].store.videoCreated.uuid) | 446 | const comment = await getComment(servers[0], servers[1].store.videoCreated.uuid) |
463 | 447 | ||
464 | const reason = 'it is a really bad comment' | 448 | const reason = 'it is a really bad comment' |
@@ -525,8 +509,6 @@ describe('Test abuses', function () { | |||
525 | }) | 509 | }) |
526 | 510 | ||
527 | it('Should keep the comment abuse when deleting the comment', async function () { | 511 | it('Should keep the comment abuse when deleting the comment', async function () { |
528 | this.timeout(10000) | ||
529 | |||
530 | const commentServer2 = await getComment(servers[0], servers[1].store.videoCreated.uuid) | 512 | const commentServer2 = await getComment(servers[0], servers[1].store.videoCreated.uuid) |
531 | 513 | ||
532 | await servers[0].comments.delete({ videoId: servers[1].store.videoCreated.uuid, commentId: commentServer2.id }) | 514 | await servers[0].comments.delete({ videoId: servers[1].store.videoCreated.uuid, commentId: commentServer2.id }) |
@@ -546,8 +528,6 @@ describe('Test abuses', function () { | |||
546 | }) | 528 | }) |
547 | 529 | ||
548 | it('Should delete the comment abuse', async function () { | 530 | it('Should delete the comment abuse', async function () { |
549 | this.timeout(10000) | ||
550 | |||
551 | await commands[1].delete({ abuseId: abuseServer2.id }) | 531 | await commands[1].delete({ abuseId: abuseServer2.id }) |
552 | 532 | ||
553 | await waitJobs(servers) | 533 | await waitJobs(servers) |
@@ -645,8 +625,6 @@ describe('Test abuses', function () { | |||
645 | }) | 625 | }) |
646 | 626 | ||
647 | it('Should report abuse on a remote account', async function () { | 627 | it('Should report abuse on a remote account', async function () { |
648 | this.timeout(10000) | ||
649 | |||
650 | const account = await getAccountFromServer(servers[0], 'user_2', servers[1]) | 628 | const account = await getAccountFromServer(servers[0], 'user_2', servers[1]) |
651 | 629 | ||
652 | const reason = 'it is a really bad account' | 630 | const reason = 'it is a really bad account' |
@@ -699,8 +677,6 @@ describe('Test abuses', function () { | |||
699 | }) | 677 | }) |
700 | 678 | ||
701 | it('Should keep the account abuse when deleting the account', async function () { | 679 | it('Should keep the account abuse when deleting the account', async function () { |
702 | this.timeout(10000) | ||
703 | |||
704 | const account = await getAccountFromServer(servers[1], 'user_2', servers[1]) | 680 | const account = await getAccountFromServer(servers[1], 'user_2', servers[1]) |
705 | await servers[1].users.remove({ userId: account.userId }) | 681 | await servers[1].users.remove({ userId: account.userId }) |
706 | 682 | ||
@@ -715,8 +691,6 @@ describe('Test abuses', function () { | |||
715 | }) | 691 | }) |
716 | 692 | ||
717 | it('Should delete the account abuse', async function () { | 693 | it('Should delete the account abuse', async function () { |
718 | this.timeout(10000) | ||
719 | |||
720 | await commands[1].delete({ abuseId: abuseServer2.id }) | 694 | await commands[1].delete({ abuseId: abuseServer2.id }) |
721 | 695 | ||
722 | await waitJobs(servers) | 696 | await waitJobs(servers) |
diff --git a/server/tests/api/moderation/blocklist-notification.ts b/server/tests/api/moderation/blocklist-notification.ts index eb092a1df..9c2863a58 100644 --- a/server/tests/api/moderation/blocklist-notification.ts +++ b/server/tests/api/moderation/blocklist-notification.ts | |||
@@ -113,8 +113,6 @@ describe('Test blocklist notifications', function () { | |||
113 | }) | 113 | }) |
114 | 114 | ||
115 | it('Should block an account', async function () { | 115 | it('Should block an account', async function () { |
116 | this.timeout(10000) | ||
117 | |||
118 | await servers[0].blocklist.addToMyBlocklist({ token: userToken1, account: 'user3@' + servers[1].host }) | 116 | await servers[0].blocklist.addToMyBlocklist({ token: userToken1, account: 'user3@' + servers[1].host }) |
119 | await waitJobs(servers) | 117 | await waitJobs(servers) |
120 | }) | 118 | }) |
@@ -146,8 +144,6 @@ describe('Test blocklist notifications', function () { | |||
146 | }) | 144 | }) |
147 | 145 | ||
148 | it('Should block an account', async function () { | 146 | it('Should block an account', async function () { |
149 | this.timeout(10000) | ||
150 | |||
151 | await servers[0].blocklist.addToMyBlocklist({ token: userToken1, server: servers[1].host }) | 147 | await servers[0].blocklist.addToMyBlocklist({ token: userToken1, server: servers[1].host }) |
152 | await waitJobs(servers) | 148 | await waitJobs(servers) |
153 | }) | 149 | }) |
@@ -186,8 +182,6 @@ describe('Test blocklist notifications', function () { | |||
186 | }) | 182 | }) |
187 | 183 | ||
188 | it('Should block an account', async function () { | 184 | it('Should block an account', async function () { |
189 | this.timeout(10000) | ||
190 | |||
191 | await servers[0].blocklist.addToServerBlocklist({ account: 'user3@' + servers[1].host }) | 185 | await servers[0].blocklist.addToServerBlocklist({ account: 'user3@' + servers[1].host }) |
192 | await waitJobs(servers) | 186 | await waitJobs(servers) |
193 | }) | 187 | }) |
@@ -221,8 +215,6 @@ describe('Test blocklist notifications', function () { | |||
221 | }) | 215 | }) |
222 | 216 | ||
223 | it('Should block an account', async function () { | 217 | it('Should block an account', async function () { |
224 | this.timeout(10000) | ||
225 | |||
226 | await servers[0].blocklist.addToServerBlocklist({ server: servers[1].host }) | 218 | await servers[0].blocklist.addToServerBlocklist({ server: servers[1].host }) |
227 | await waitJobs(servers) | 219 | await waitJobs(servers) |
228 | }) | 220 | }) |
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts index 47d29e7f8..b90d8c16c 100644 --- a/server/tests/api/moderation/blocklist.ts +++ b/server/tests/api/moderation/blocklist.ts | |||
@@ -439,8 +439,6 @@ describe('Test blocklist', function () { | |||
439 | }) | 439 | }) |
440 | 440 | ||
441 | it('Should hide its comments', async function () { | 441 | it('Should hide its comments', async function () { |
442 | this.timeout(10000) | ||
443 | |||
444 | const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) | 442 | const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) |
445 | 443 | ||
446 | await waitJobs(servers) | 444 | await waitJobs(servers) |
@@ -767,8 +765,6 @@ describe('Test blocklist', function () { | |||
767 | }) | 765 | }) |
768 | 766 | ||
769 | it('Should hide its comments', async function () { | 767 | it('Should hide its comments', async function () { |
770 | this.timeout(10000) | ||
771 | |||
772 | const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) | 768 | const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) |
773 | 769 | ||
774 | await waitJobs(servers) | 770 | await waitJobs(servers) |
diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts index c8be762d2..21473b6bf 100644 --- a/server/tests/api/search/search-index.ts +++ b/server/tests/api/search/search-index.ts | |||
@@ -32,8 +32,6 @@ describe('Test index search', function () { | |||
32 | describe('Default search', async function () { | 32 | describe('Default search', async function () { |
33 | 33 | ||
34 | it('Should make a local videos search by default', async function () { | 34 | it('Should make a local videos search by default', async function () { |
35 | this.timeout(10000) | ||
36 | |||
37 | await server.config.updateCustomSubConfig({ | 35 | await server.config.updateCustomSubConfig({ |
38 | newConfig: { | 36 | newConfig: { |
39 | search: { | 37 | search: { |
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts index dd971203a..0256cc193 100644 --- a/server/tests/api/server/contact-form.ts +++ b/server/tests/api/server/contact-form.ts | |||
@@ -31,8 +31,6 @@ describe('Test contact form', function () { | |||
31 | }) | 31 | }) |
32 | 32 | ||
33 | it('Should send a contact form', async function () { | 33 | it('Should send a contact form', async function () { |
34 | this.timeout(10000) | ||
35 | |||
36 | await command.send({ | 34 | await command.send({ |
37 | fromEmail: 'toto@example.com', | 35 | fromEmail: 'toto@example.com', |
38 | body: 'my super message', | 36 | body: 'my super message', |
@@ -61,8 +59,6 @@ describe('Test contact form', function () { | |||
61 | }) | 59 | }) |
62 | 60 | ||
63 | it('Should not be able to send another contact form because of the anti spam checker', async function () { | 61 | it('Should not be able to send another contact form because of the anti spam checker', async function () { |
64 | this.timeout(10000) | ||
65 | |||
66 | await wait(1000) | 62 | await wait(1000) |
67 | 63 | ||
68 | await command.send({ | 64 | await command.send({ |
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts index 5a0bf360c..9141cc697 100644 --- a/server/tests/api/server/email.ts +++ b/server/tests/api/server/email.ts | |||
@@ -124,8 +124,6 @@ describe('Test emails', function () { | |||
124 | describe('When creating a user without password', function () { | 124 | describe('When creating a user without password', function () { |
125 | 125 | ||
126 | it('Should send a create password email', async function () { | 126 | it('Should send a create password email', async function () { |
127 | this.timeout(10000) | ||
128 | |||
129 | await server.users.create({ username: 'create_password', password: '' }) | 127 | await server.users.create({ username: 'create_password', password: '' }) |
130 | 128 | ||
131 | await waitJobs(server) | 129 | await waitJobs(server) |
@@ -179,8 +177,6 @@ describe('Test emails', function () { | |||
179 | describe('When creating an abuse', function () { | 177 | describe('When creating an abuse', function () { |
180 | 178 | ||
181 | it('Should send the notification email', async function () { | 179 | it('Should send the notification email', async function () { |
182 | this.timeout(10000) | ||
183 | |||
184 | const reason = 'my super bad reason' | 180 | const reason = 'my super bad reason' |
185 | await server.abuses.report({ token: userAccessToken, videoId, reason }) | 181 | await server.abuses.report({ token: userAccessToken, videoId, reason }) |
186 | 182 | ||
@@ -200,8 +196,6 @@ describe('Test emails', function () { | |||
200 | describe('When blocking/unblocking user', function () { | 196 | describe('When blocking/unblocking user', function () { |
201 | 197 | ||
202 | it('Should send the notification email when blocking a user', async function () { | 198 | it('Should send the notification email when blocking a user', async function () { |
203 | this.timeout(10000) | ||
204 | |||
205 | const reason = 'my super bad reason' | 199 | const reason = 'my super bad reason' |
206 | await server.users.banUser({ userId, reason }) | 200 | await server.users.banUser({ userId, reason }) |
207 | 201 | ||
@@ -219,8 +213,6 @@ describe('Test emails', function () { | |||
219 | }) | 213 | }) |
220 | 214 | ||
221 | it('Should send the notification email when unblocking a user', async function () { | 215 | it('Should send the notification email when unblocking a user', async function () { |
222 | this.timeout(10000) | ||
223 | |||
224 | await server.users.unbanUser({ userId }) | 216 | await server.users.unbanUser({ userId }) |
225 | 217 | ||
226 | await waitJobs(server) | 218 | await waitJobs(server) |
@@ -238,8 +230,6 @@ describe('Test emails', function () { | |||
238 | 230 | ||
239 | describe('When blacklisting a video', function () { | 231 | describe('When blacklisting a video', function () { |
240 | it('Should send the notification email', async function () { | 232 | it('Should send the notification email', async function () { |
241 | this.timeout(10000) | ||
242 | |||
243 | const reason = 'my super reason' | 233 | const reason = 'my super reason' |
244 | await server.blacklist.add({ videoId: videoUserUUID, reason }) | 234 | await server.blacklist.add({ videoId: videoUserUUID, reason }) |
245 | 235 | ||
@@ -257,8 +247,6 @@ describe('Test emails', function () { | |||
257 | }) | 247 | }) |
258 | 248 | ||
259 | it('Should send the notification email', async function () { | 249 | it('Should send the notification email', async function () { |
260 | this.timeout(10000) | ||
261 | |||
262 | await server.blacklist.remove({ videoId: videoUserUUID }) | 250 | await server.blacklist.remove({ videoId: videoUserUUID }) |
263 | 251 | ||
264 | await waitJobs(server) | 252 | await waitJobs(server) |
@@ -282,8 +270,6 @@ describe('Test emails', function () { | |||
282 | describe('When verifying a user email', function () { | 270 | describe('When verifying a user email', function () { |
283 | 271 | ||
284 | it('Should ask to send the verification email', async function () { | 272 | it('Should ask to send the verification email', async function () { |
285 | this.timeout(10000) | ||
286 | |||
287 | await server.users.askSendVerifyEmail({ email: 'user_1@example.com' }) | 273 | await server.users.askSendVerifyEmail({ email: 'user_1@example.com' }) |
288 | 274 | ||
289 | await waitJobs(server) | 275 | await waitJobs(server) |
@@ -337,8 +323,6 @@ describe('Test emails', function () { | |||
337 | }) | 323 | }) |
338 | 324 | ||
339 | it('Should ask to send the verification email', async function () { | 325 | it('Should ask to send the verification email', async function () { |
340 | this.timeout(10000) | ||
341 | |||
342 | await server.registrations.askSendVerifyEmail({ email: 'request_1@example.com' }) | 326 | await server.registrations.askSendVerifyEmail({ email: 'request_1@example.com' }) |
343 | 327 | ||
344 | await waitJobs(server) | 328 | await waitJobs(server) |
diff --git a/server/tests/api/server/follows-moderation.ts b/server/tests/api/server/follows-moderation.ts index 45e56518a..d145dd9d2 100644 --- a/server/tests/api/server/follows-moderation.ts +++ b/server/tests/api/server/follows-moderation.ts | |||
@@ -111,8 +111,6 @@ describe('Test follows moderation', function () { | |||
111 | }) | 111 | }) |
112 | 112 | ||
113 | it('Should remove follower on server 2', async function () { | 113 | it('Should remove follower on server 2', async function () { |
114 | this.timeout(10000) | ||
115 | |||
116 | await commands[1].removeFollower({ follower: servers[0] }) | 114 | await commands[1].removeFollower({ follower: servers[0] }) |
117 | 115 | ||
118 | await waitJobs(servers) | 116 | await waitJobs(servers) |
@@ -126,8 +124,6 @@ describe('Test follows moderation', function () { | |||
126 | describe('Disabled/Enabled followers', function () { | 124 | describe('Disabled/Enabled followers', function () { |
127 | 125 | ||
128 | it('Should disable followers on server 2', async function () { | 126 | it('Should disable followers on server 2', async function () { |
129 | this.timeout(10000) | ||
130 | |||
131 | const subConfig = { | 127 | const subConfig = { |
132 | followers: { | 128 | followers: { |
133 | instance: { | 129 | instance: { |
@@ -146,8 +142,6 @@ describe('Test follows moderation', function () { | |||
146 | }) | 142 | }) |
147 | 143 | ||
148 | it('Should re enable followers on server 2', async function () { | 144 | it('Should re enable followers on server 2', async function () { |
149 | this.timeout(10000) | ||
150 | |||
151 | const subConfig = { | 145 | const subConfig = { |
152 | followers: { | 146 | followers: { |
153 | instance: { | 147 | instance: { |
@@ -193,8 +187,6 @@ describe('Test follows moderation', function () { | |||
193 | }) | 187 | }) |
194 | 188 | ||
195 | it('Should accept a follower', async function () { | 189 | it('Should accept a follower', async function () { |
196 | this.timeout(10000) | ||
197 | |||
198 | await commands[1].acceptFollower({ follower: 'peertube@' + servers[0].host }) | 190 | await commands[1].acceptFollower({ follower: 'peertube@' + servers[0].host }) |
199 | await waitJobs(servers) | 191 | await waitJobs(servers) |
200 | 192 | ||
diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts index a662992e0..e2079f290 100644 --- a/server/tests/api/server/logs.ts +++ b/server/tests/api/server/logs.ts | |||
@@ -114,8 +114,6 @@ describe('Test logs', function () { | |||
114 | }) | 114 | }) |
115 | 115 | ||
116 | it('Should log ping requests', async function () { | 116 | it('Should log ping requests', async function () { |
117 | this.timeout(10000) | ||
118 | |||
119 | const now = new Date() | 117 | const now = new Date() |
120 | 118 | ||
121 | await server.servers.ping() | 119 | await server.servers.ping() |
diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts index 199d205c7..a0e9db1d3 100644 --- a/server/tests/api/server/plugins.ts +++ b/server/tests/api/server/plugins.ts | |||
@@ -189,8 +189,6 @@ describe('Test plugins', function () { | |||
189 | }) | 189 | }) |
190 | 190 | ||
191 | it('Should have watched settings changes', async function () { | 191 | it('Should have watched settings changes', async function () { |
192 | this.timeout(10000) | ||
193 | |||
194 | await server.servers.waitUntilLog('Settings changed!') | 192 | await server.servers.waitUntilLog('Settings changed!') |
195 | }) | 193 | }) |
196 | 194 | ||
diff --git a/server/tests/api/server/tracker.ts b/server/tests/api/server/tracker.ts index edc1b3123..34d450998 100644 --- a/server/tests/api/server/tracker.ts +++ b/server/tests/api/server/tracker.ts | |||
@@ -27,7 +27,6 @@ describe('Test tracker', function () { | |||
27 | }) | 27 | }) |
28 | 28 | ||
29 | it('Should succeed with the correct infohash', function (done) { | 29 | it('Should succeed with the correct infohash', function (done) { |
30 | this.timeout(10000) | ||
31 | const webtorrent = new WebTorrent() | 30 | const webtorrent = new WebTorrent() |
32 | 31 | ||
33 | const torrent = webtorrent.add(goodMagnet) | 32 | const torrent = webtorrent.add(goodMagnet) |
diff --git a/server/tests/api/transcoding/hls.ts b/server/tests/api/transcoding/hls.ts index 84a53c0bd..b6e4fe8e5 100644 --- a/server/tests/api/transcoding/hls.ts +++ b/server/tests/api/transcoding/hls.ts | |||
@@ -60,8 +60,6 @@ describe('Test HLS videos', function () { | |||
60 | }) | 60 | }) |
61 | 61 | ||
62 | it('Should delete videos', async function () { | 62 | it('Should delete videos', async function () { |
63 | this.timeout(10000) | ||
64 | |||
65 | for (const uuid of videoUUIDs) { | 63 | for (const uuid of videoUUIDs) { |
66 | await servers[0].videos.remove({ id: uuid }) | 64 | await servers[0].videos.remove({ id: uuid }) |
67 | } | 65 | } |
diff --git a/server/tests/api/users/users-email-verification.ts b/server/tests/api/users/users-email-verification.ts index cb84dc758..909226311 100644 --- a/server/tests/api/users/users-email-verification.ts +++ b/server/tests/api/users/users-email-verification.ts | |||
@@ -90,8 +90,6 @@ describe('Test users email verification', function () { | |||
90 | }) | 90 | }) |
91 | 91 | ||
92 | it('Should be able to change the user email', async function () { | 92 | it('Should be able to change the user email', async function () { |
93 | this.timeout(10000) | ||
94 | |||
95 | let updateVerificationString: string | 93 | let updateVerificationString: string |
96 | 94 | ||
97 | { | 95 | { |
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts index 8d9436247..3823b74ef 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts | |||
@@ -66,8 +66,6 @@ describe('Test users with multiple servers', function () { | |||
66 | }) | 66 | }) |
67 | 67 | ||
68 | it('Should be able to update my display name', async function () { | 68 | it('Should be able to update my display name', async function () { |
69 | this.timeout(10000) | ||
70 | |||
71 | await servers[0].users.updateMe({ displayName: 'my super display name' }) | 69 | await servers[0].users.updateMe({ displayName: 'my super display name' }) |
72 | 70 | ||
73 | user = await servers[0].users.getMyInfo() | 71 | user = await servers[0].users.getMyInfo() |
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index b44e1bc37..0cb64d5a5 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts | |||
@@ -136,8 +136,6 @@ describe('Test a single server', function () { | |||
136 | }) | 136 | }) |
137 | 137 | ||
138 | it('Should upload the video', async function () { | 138 | it('Should upload the video', async function () { |
139 | this.timeout(10000) | ||
140 | |||
141 | const attributes = { | 139 | const attributes = { |
142 | name: 'my super name', | 140 | name: 'my super name', |
143 | category: 2, | 141 | category: 2, |
diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts index e9ef67493..99d774c2b 100644 --- a/server/tests/api/videos/video-change-ownership.ts +++ b/server/tests/api/videos/video-change-ownership.ts | |||
@@ -130,14 +130,10 @@ describe('Test video change ownership - nominal', function () { | |||
130 | }) | 130 | }) |
131 | 131 | ||
132 | it('Should accept the same change ownership request without crashing', async function () { | 132 | it('Should accept the same change ownership request without crashing', async function () { |
133 | this.timeout(10000) | ||
134 | |||
135 | await command.create({ token: firstUserToken, videoId: servers[0].store.videoCreated.id, username: secondUser }) | 133 | await command.create({ token: firstUserToken, videoId: servers[0].store.videoCreated.id, username: secondUser }) |
136 | }) | 134 | }) |
137 | 135 | ||
138 | it('Should not create multiple change ownership requests while one is waiting', async function () { | 136 | it('Should not create multiple change ownership requests while one is waiting', async function () { |
139 | this.timeout(10000) | ||
140 | |||
141 | const body = await command.list({ token: secondUserToken }) | 137 | const body = await command.list({ token: secondUserToken }) |
142 | 138 | ||
143 | expect(body.total).to.equal(1) | 139 | expect(body.total).to.equal(1) |
@@ -146,14 +142,10 @@ describe('Test video change ownership - nominal', function () { | |||
146 | }) | 142 | }) |
147 | 143 | ||
148 | it('Should not be possible to refuse the change of ownership from first user', async function () { | 144 | it('Should not be possible to refuse the change of ownership from first user', async function () { |
149 | this.timeout(10000) | ||
150 | |||
151 | await command.refuse({ token: firstUserToken, ownershipId: lastRequestId, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | 145 | await command.refuse({ token: firstUserToken, ownershipId: lastRequestId, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
152 | }) | 146 | }) |
153 | 147 | ||
154 | it('Should be possible to refuse the change of ownership from second user', async function () { | 148 | it('Should be possible to refuse the change of ownership from second user', async function () { |
155 | this.timeout(10000) | ||
156 | |||
157 | await command.refuse({ token: secondUserToken, ownershipId: lastRequestId }) | 149 | await command.refuse({ token: secondUserToken, ownershipId: lastRequestId }) |
158 | }) | 150 | }) |
159 | 151 | ||
@@ -184,8 +176,6 @@ describe('Test video change ownership - nominal', function () { | |||
184 | }) | 176 | }) |
185 | 177 | ||
186 | it('Should not be possible to accept the change of ownership from first user', async function () { | 178 | it('Should not be possible to accept the change of ownership from first user', async function () { |
187 | this.timeout(10000) | ||
188 | |||
189 | await command.accept({ | 179 | await command.accept({ |
190 | token: firstUserToken, | 180 | token: firstUserToken, |
191 | ownershipId: lastRequestId, | 181 | ownershipId: lastRequestId, |
@@ -195,8 +185,6 @@ describe('Test video change ownership - nominal', function () { | |||
195 | }) | 185 | }) |
196 | 186 | ||
197 | it('Should be possible to accept the change of ownership from second user', async function () { | 187 | it('Should be possible to accept the change of ownership from second user', async function () { |
198 | this.timeout(10000) | ||
199 | |||
200 | await command.accept({ token: secondUserToken, ownershipId: lastRequestId, channelId: secondUserChannelId }) | 188 | await command.accept({ token: secondUserToken, ownershipId: lastRequestId, channelId: secondUserChannelId }) |
201 | 189 | ||
202 | await waitJobs(servers) | 190 | await waitJobs(servers) |
@@ -309,8 +297,6 @@ describe('Test video change ownership - quota too small', function () { | |||
309 | }) | 297 | }) |
310 | 298 | ||
311 | it('Should not be possible to accept the change of ownership from second user because of exceeded quota', async function () { | 299 | it('Should not be possible to accept the change of ownership from second user because of exceeded quota', async function () { |
312 | this.timeout(10000) | ||
313 | |||
314 | const { videoChannels } = await server.users.getMyInfo({ token: secondUserToken }) | 300 | const { videoChannels } = await server.users.getMyInfo({ token: secondUserToken }) |
315 | const channelId = videoChannels[0].id | 301 | const channelId = videoChannels[0].id |
316 | 302 | ||
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 8e2b7937c..f7cf84618 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts | |||
@@ -378,8 +378,6 @@ describe('Test video channels', function () { | |||
378 | }) | 378 | }) |
379 | 379 | ||
380 | it('Should list the second video channel videos', async function () { | 380 | it('Should list the second video channel videos', async function () { |
381 | this.timeout(10000) | ||
382 | |||
383 | for (const server of servers) { | 381 | for (const server of servers) { |
384 | const channelURI = 'second_video_channel@' + servers[0].host | 382 | const channelURI = 'second_video_channel@' + servers[0].host |
385 | const { total, data } = await server.videos.listByChannel({ handle: channelURI }) | 383 | const { total, data } = await server.videos.listByChannel({ handle: channelURI }) |
@@ -392,16 +390,12 @@ describe('Test video channels', function () { | |||
392 | }) | 390 | }) |
393 | 391 | ||
394 | it('Should change the video channel of a video', async function () { | 392 | it('Should change the video channel of a video', async function () { |
395 | this.timeout(10000) | ||
396 | |||
397 | await servers[0].videos.update({ id: videoUUID, attributes: { channelId: servers[0].store.channel.id } }) | 393 | await servers[0].videos.update({ id: videoUUID, attributes: { channelId: servers[0].store.channel.id } }) |
398 | 394 | ||
399 | await waitJobs(servers) | 395 | await waitJobs(servers) |
400 | }) | 396 | }) |
401 | 397 | ||
402 | it('Should list the first video channel videos', async function () { | 398 | it('Should list the first video channel videos', async function () { |
403 | this.timeout(10000) | ||
404 | |||
405 | for (const server of servers) { | 399 | for (const server of servers) { |
406 | { | 400 | { |
407 | const secondChannelURI = 'second_video_channel@' + servers[0].host | 401 | const secondChannelURI = 'second_video_channel@' + servers[0].host |
@@ -452,8 +446,6 @@ describe('Test video channels', function () { | |||
452 | }) | 446 | }) |
453 | 447 | ||
454 | it('Should report correct channel views per days', async function () { | 448 | it('Should report correct channel views per days', async function () { |
455 | this.timeout(10000) | ||
456 | |||
457 | { | 449 | { |
458 | const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true }) | 450 | const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true }) |
459 | 451 | ||
diff --git a/server/tests/api/videos/video-description.ts b/server/tests/api/videos/video-description.ts index c4185882a..1f3d4adbb 100644 --- a/server/tests/api/videos/video-description.ts +++ b/server/tests/api/videos/video-description.ts | |||
@@ -78,8 +78,6 @@ describe('Test video description', function () { | |||
78 | }) | 78 | }) |
79 | 79 | ||
80 | it('Should update with a short description', async function () { | 80 | it('Should update with a short description', async function () { |
81 | this.timeout(10000) | ||
82 | |||
83 | const attributes = { | 81 | const attributes = { |
84 | description: 'short description' | 82 | description: 'short description' |
85 | } | 83 | } |
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts index 264a05d3f..de96bcfcc 100644 --- a/server/tests/api/videos/video-privacy.ts +++ b/server/tests/api/videos/video-privacy.ts | |||
@@ -99,8 +99,6 @@ describe('Test video privacy', function () { | |||
99 | }) | 99 | }) |
100 | 100 | ||
101 | it('Should not be able to watch the private video with another user', async function () { | 101 | it('Should not be able to watch the private video with another user', async function () { |
102 | this.timeout(10000) | ||
103 | |||
104 | const user = { | 102 | const user = { |
105 | username: 'hello', | 103 | username: 'hello', |
106 | password: 'super password' | 104 | password: 'super password' |
@@ -254,8 +252,6 @@ describe('Test video privacy', function () { | |||
254 | }) | 252 | }) |
255 | 253 | ||
256 | it('Should set these videos as private and internal', async function () { | 254 | it('Should set these videos as private and internal', async function () { |
257 | this.timeout(10000) | ||
258 | |||
259 | await servers[0].videos.update({ id: internalVideoId, attributes: { privacy: VideoPrivacy.PRIVATE } }) | 255 | await servers[0].videos.update({ id: internalVideoId, attributes: { privacy: VideoPrivacy.PRIVATE } }) |
260 | await servers[0].videos.update({ id: privateVideoId, attributes: { privacy: VideoPrivacy.INTERNAL } }) | 256 | await servers[0].videos.update({ id: privateVideoId, attributes: { privacy: VideoPrivacy.INTERNAL } }) |
261 | 257 | ||
diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts index 73f1519d9..bf341c648 100644 --- a/server/tests/api/videos/video-schedule-update.ts +++ b/server/tests/api/videos/video-schedule-update.ts | |||
@@ -35,8 +35,6 @@ describe('Test video update scheduler', function () { | |||
35 | }) | 35 | }) |
36 | 36 | ||
37 | it('Should upload a video and schedule an update in 10 seconds', async function () { | 37 | it('Should upload a video and schedule an update in 10 seconds', async function () { |
38 | this.timeout(10000) | ||
39 | |||
40 | const attributes = { | 38 | const attributes = { |
41 | name: 'video 1', | 39 | name: 'video 1', |
42 | privacy: VideoPrivacy.PRIVATE, | 40 | privacy: VideoPrivacy.PRIVATE, |
@@ -89,8 +87,6 @@ describe('Test video update scheduler', function () { | |||
89 | }) | 87 | }) |
90 | 88 | ||
91 | it('Should upload a video without scheduling an update', async function () { | 89 | it('Should upload a video without scheduling an update', async function () { |
92 | this.timeout(10000) | ||
93 | |||
94 | const attributes = { | 90 | const attributes = { |
95 | name: 'video 2', | 91 | name: 'video 2', |
96 | privacy: VideoPrivacy.PRIVATE | 92 | privacy: VideoPrivacy.PRIVATE |
@@ -103,8 +99,6 @@ describe('Test video update scheduler', function () { | |||
103 | }) | 99 | }) |
104 | 100 | ||
105 | it('Should update a video by scheduling an update', async function () { | 101 | it('Should update a video by scheduling an update', async function () { |
106 | this.timeout(10000) | ||
107 | |||
108 | const attributes = { | 102 | const attributes = { |
109 | name: 'video 2 updated', | 103 | name: 'video 2 updated', |
110 | scheduleUpdate: { | 104 | scheduleUpdate: { |
diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts index 6e723c510..f2496e35e 100644 --- a/server/tests/api/videos/videos-overview.ts +++ b/server/tests/api/videos/videos-overview.ts | |||
@@ -47,7 +47,7 @@ describe('Test a videos overview', function () { | |||
47 | }) | 47 | }) |
48 | 48 | ||
49 | it('Should upload another video and include all videos in the overview', async function () { | 49 | it('Should upload another video and include all videos in the overview', async function () { |
50 | this.timeout(60000) | 50 | this.timeout(120000) |
51 | 51 | ||
52 | { | 52 | { |
53 | for (let i = 1; i < 6; i++) { | 53 | for (let i = 1; i < 6; i++) { |
diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts index 400d5867c..ad14fde91 100644 --- a/server/tests/cli/peertube.ts +++ b/server/tests/cli/peertube.ts | |||
@@ -321,15 +321,11 @@ describe('Test CLI wrapper', function () { | |||
321 | }) | 321 | }) |
322 | 322 | ||
323 | after(async function () { | 323 | after(async function () { |
324 | this.timeout(10000) | ||
325 | |||
326 | await cleanupTests([ anotherServer ]) | 324 | await cleanupTests([ anotherServer ]) |
327 | }) | 325 | }) |
328 | }) | 326 | }) |
329 | 327 | ||
330 | after(async function () { | 328 | after(async function () { |
331 | this.timeout(10000) | ||
332 | |||
333 | await cleanupTests([ server ]) | 329 | await cleanupTests([ server ]) |
334 | }) | 330 | }) |
335 | }) | 331 | }) |
diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts index cadd02e8d..95d7a4b58 100644 --- a/server/tests/external-plugins/auto-block-videos.ts +++ b/server/tests/external-plugins/auto-block-videos.ts | |||
@@ -71,8 +71,6 @@ describe('Official plugin auto-block videos', function () { | |||
71 | }) | 71 | }) |
72 | 72 | ||
73 | it('Should auto block a video', async function () { | 73 | it('Should auto block a video', async function () { |
74 | this.timeout(10000) | ||
75 | |||
76 | await check(servers[0], server2Videos[0].uuid, true) | 74 | await check(servers[0], server2Videos[0].uuid, true) |
77 | 75 | ||
78 | blocklistServer.replace({ | 76 | blocklistServer.replace({ |
@@ -98,8 +96,6 @@ describe('Official plugin auto-block videos', function () { | |||
98 | }) | 96 | }) |
99 | 97 | ||
100 | it('Should not block a local video', async function () { | 98 | it('Should not block a local video', async function () { |
101 | this.timeout(10000) | ||
102 | |||
103 | await check(servers[0], server1Videos[0].uuid, true) | 99 | await check(servers[0], server1Videos[0].uuid, true) |
104 | 100 | ||
105 | blocklistServer.replace({ | 101 | blocklistServer.replace({ |
@@ -116,8 +112,6 @@ describe('Official plugin auto-block videos', function () { | |||
116 | }) | 112 | }) |
117 | 113 | ||
118 | it('Should remove a video block', async function () { | 114 | it('Should remove a video block', async function () { |
119 | this.timeout(10000) | ||
120 | |||
121 | await check(servers[0], server2Videos[0].uuid, false) | 115 | await check(servers[0], server2Videos[0].uuid, false) |
122 | 116 | ||
123 | blocklistServer.replace({ | 117 | blocklistServer.replace({ |
diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts index cfed76e88..a9bf3c173 100644 --- a/server/tests/external-plugins/auto-mute.ts +++ b/server/tests/external-plugins/auto-mute.ts | |||
@@ -50,8 +50,6 @@ describe('Official plugin auto-mute', function () { | |||
50 | }) | 50 | }) |
51 | 51 | ||
52 | it('Should add a server blocklist', async function () { | 52 | it('Should add a server blocklist', async function () { |
53 | this.timeout(10000) | ||
54 | |||
55 | blocklistServer.replace({ | 53 | blocklistServer.replace({ |
56 | data: [ | 54 | data: [ |
57 | { | 55 | { |
@@ -67,8 +65,6 @@ describe('Official plugin auto-mute', function () { | |||
67 | }) | 65 | }) |
68 | 66 | ||
69 | it('Should remove a server blocklist', async function () { | 67 | it('Should remove a server blocklist', async function () { |
70 | this.timeout(10000) | ||
71 | |||
72 | blocklistServer.replace({ | 68 | blocklistServer.replace({ |
73 | data: [ | 69 | data: [ |
74 | { | 70 | { |
@@ -85,8 +81,6 @@ describe('Official plugin auto-mute', function () { | |||
85 | }) | 81 | }) |
86 | 82 | ||
87 | it('Should add an account blocklist', async function () { | 83 | it('Should add an account blocklist', async function () { |
88 | this.timeout(10000) | ||
89 | |||
90 | blocklistServer.replace({ | 84 | blocklistServer.replace({ |
91 | data: [ | 85 | data: [ |
92 | { | 86 | { |
@@ -102,8 +96,6 @@ describe('Official plugin auto-mute', function () { | |||
102 | }) | 96 | }) |
103 | 97 | ||
104 | it('Should remove an account blocklist', async function () { | 98 | it('Should remove an account blocklist', async function () { |
105 | this.timeout(10000) | ||
106 | |||
107 | blocklistServer.replace({ | 99 | blocklistServer.replace({ |
108 | data: [ | 100 | data: [ |
109 | { | 101 | { |
diff --git a/server/tests/plugins/external-auth.ts b/server/tests/plugins/external-auth.ts index e600f958f..e4015939a 100644 --- a/server/tests/plugins/external-auth.ts +++ b/server/tests/plugins/external-auth.ts | |||
@@ -290,8 +290,6 @@ describe('Test external auth plugins', function () { | |||
290 | }) | 290 | }) |
291 | 291 | ||
292 | it('Should reject token of Kefka by the plugin hook', async function () { | 292 | it('Should reject token of Kefka by the plugin hook', async function () { |
293 | this.timeout(10000) | ||
294 | |||
295 | await wait(5000) | 293 | await wait(5000) |
296 | 294 | ||
297 | await server.users.getMyInfo({ token: kefkaAccessToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) | 295 | await server.users.getMyInfo({ token: kefkaAccessToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) |
diff --git a/server/tests/plugins/id-and-pass-auth.ts b/server/tests/plugins/id-and-pass-auth.ts index 10155c28b..127c29cbc 100644 --- a/server/tests/plugins/id-and-pass-auth.ts +++ b/server/tests/plugins/id-and-pass-auth.ts | |||
@@ -163,8 +163,6 @@ describe('Test id and pass auth plugins', function () { | |||
163 | }) | 163 | }) |
164 | 164 | ||
165 | it('Should reject token of laguna by the plugin hook', async function () { | 165 | it('Should reject token of laguna by the plugin hook', async function () { |
166 | this.timeout(10000) | ||
167 | |||
168 | await wait(5000) | 166 | await wait(5000) |
169 | 167 | ||
170 | await server.users.getMyInfo({ token: lagunaAccessToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) | 168 | await server.users.getMyInfo({ token: lagunaAccessToken, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) |
diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts index a47b7d4d2..e951a1299 100644 --- a/server/tests/plugins/plugin-helpers.ts +++ b/server/tests/plugins/plugin-helpers.ts | |||
@@ -219,7 +219,6 @@ describe('Test plugin helpers', function () { | |||
219 | }) | 219 | }) |
220 | 220 | ||
221 | it('Should mute server 2', async function () { | 221 | it('Should mute server 2', async function () { |
222 | this.timeout(10000) | ||
223 | await postCommand(servers[0], 'blockServer', { hostToBlock: servers[1].host }) | 222 | await postCommand(servers[0], 'blockServer', { hostToBlock: servers[1].host }) |
224 | 223 | ||
225 | const { data } = await servers[0].videos.list() | 224 | const { data } = await servers[0].videos.list() |
@@ -254,8 +253,6 @@ describe('Test plugin helpers', function () { | |||
254 | }) | 253 | }) |
255 | 254 | ||
256 | it('Should blacklist video', async function () { | 255 | it('Should blacklist video', async function () { |
257 | this.timeout(10000) | ||
258 | |||
259 | await postCommand(servers[0], 'blacklist', { videoUUID: videoUUIDServer1, unfederate: true }) | 256 | await postCommand(servers[0], 'blacklist', { videoUUID: videoUUIDServer1, unfederate: true }) |
260 | 257 | ||
261 | await waitJobs(servers) | 258 | await waitJobs(servers) |
@@ -269,8 +266,6 @@ describe('Test plugin helpers', function () { | |||
269 | }) | 266 | }) |
270 | 267 | ||
271 | it('Should unblacklist video', async function () { | 268 | it('Should unblacklist video', async function () { |
272 | this.timeout(10000) | ||
273 | |||
274 | await postCommand(servers[0], 'unblacklist', { videoUUID: videoUUIDServer1 }) | 269 | await postCommand(servers[0], 'unblacklist', { videoUUID: videoUUIDServer1 }) |
275 | 270 | ||
276 | await waitJobs(servers) | 271 | await waitJobs(servers) |
diff --git a/server/tests/shared/directories.ts b/server/tests/shared/directories.ts index 22578bc0e..5ad12d78a 100644 --- a/server/tests/shared/directories.ts +++ b/server/tests/shared/directories.ts | |||
@@ -39,5 +39,5 @@ export async function checkPeerTubeRunnerCacheIsEmpty (runner: PeerTubeRunnerPro | |||
39 | 39 | ||
40 | const files = await readdir(directoryPath) | 40 | const files = await readdir(directoryPath) |
41 | 41 | ||
42 | expect(files).to.have.lengthOf(0) | 42 | expect(files, 'Directory content: ' + files.join(', ')).to.have.lengthOf(0) |
43 | } | 43 | } |