From 33b91e53d21fba295ecf516b717fb36e91990771 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 22 May 2023 09:20:28 +0200 Subject: Remove low timeouts Default timeout is 30s --- server/tests/api/activitypub/refresher.ts | 2 -- server/tests/api/activitypub/security.ts | 8 ------- server/tests/api/check-params/plugins.ts | 2 -- server/tests/api/check-params/search.ts | 2 -- server/tests/api/live/live.ts | 4 ---- server/tests/api/moderation/abuses.ts | 26 ---------------------- .../tests/api/moderation/blocklist-notification.ts | 8 ------- server/tests/api/moderation/blocklist.ts | 4 ---- server/tests/api/search/search-index.ts | 2 -- server/tests/api/server/contact-form.ts | 4 ---- server/tests/api/server/email.ts | 16 ------------- server/tests/api/server/follows-moderation.ts | 8 ------- server/tests/api/server/logs.ts | 2 -- server/tests/api/server/plugins.ts | 2 -- server/tests/api/server/tracker.ts | 1 - server/tests/api/transcoding/hls.ts | 2 -- server/tests/api/users/users-email-verification.ts | 2 -- server/tests/api/users/users-multiple-servers.ts | 2 -- server/tests/api/videos/single-server.ts | 2 -- server/tests/api/videos/video-change-ownership.ts | 14 ------------ server/tests/api/videos/video-channels.ts | 8 ------- server/tests/api/videos/video-description.ts | 2 -- server/tests/api/videos/video-privacy.ts | 4 ---- server/tests/api/videos/video-schedule-update.ts | 6 ----- server/tests/api/videos/videos-overview.ts | 2 +- server/tests/cli/peertube.ts | 4 ---- server/tests/external-plugins/auto-block-videos.ts | 6 ----- server/tests/external-plugins/auto-mute.ts | 8 ------- server/tests/plugins/external-auth.ts | 2 -- server/tests/plugins/id-and-pass-auth.ts | 2 -- server/tests/plugins/plugin-helpers.ts | 5 ----- server/tests/shared/directories.ts | 2 +- 32 files changed, 2 insertions(+), 162 deletions(-) (limited to 'server') 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 () { }) after(async function () { - this.timeout(10000) - await sqlCommandServer2.cleanup() 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 () { describe('When checking Linked Data Signature', function () { before(async function () { - this.timeout(10000) - await setKeysOfServer(sqlCommands[0], servers[1].url, keys.publicKey, keys.privateKey) await setKeysOfServer(sqlCommands[1], servers[1].url, keys.publicKey, keys.privateKey) await setKeysOfServer(sqlCommands[2], servers[2].url, keys.publicKey, keys.privateKey) @@ -232,8 +230,6 @@ describe('Test ActivityPub security', function () { }) it('Should fail with bad keys', async function () { - this.timeout(10000) - await setKeysOfServer(sqlCommands[0], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) await setKeysOfServer(sqlCommands[2], servers[2].url, invalidKeys.publicKey, invalidKeys.privateKey) @@ -254,8 +250,6 @@ describe('Test ActivityPub security', function () { }) it('Should fail with an altered body', async function () { - this.timeout(10000) - await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) await setKeysOfServer(sqlCommands[0], servers[2].url, keys.publicKey, keys.privateKey) @@ -278,8 +272,6 @@ describe('Test ActivityPub security', function () { }) it('Should succeed with a valid signature', async function () { - this.timeout(10000) - const body = getAnnounceWithoutContext(servers[1]) body.actor = servers[2].url + '/accounts/peertube' 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 () { }) it('Should succeed with the correct parameters', async function () { - this.timeout(10000) - const it = [ { suffix: 'install', status: HttpStatusCode.OK_200 }, { 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 () { describe('Search target', function () { it('Should fail/succeed depending on the search target', async function () { - this.timeout(10000) - const query = { search: 'coucou' } const paths = [ '/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 () { }) it('Should update the live', async function () { - this.timeout(10000) - await commands[0].update({ videoId: liveVideoUUID, fields: { saveReplay: false, latencyMode: LiveVideoLatencyMode.DEFAULT } }) await waitJobs(servers) }) @@ -206,8 +204,6 @@ describe('Test live', function () { }) it('Delete the live', async function () { - this.timeout(10000) - await servers[0].videos.remove({ id: liveVideoUUID }) await waitJobs(servers) }) 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 () { }) it('Should report abuse on a remote video', async function () { - this.timeout(10000) - const reason = 'my super bad reason 2' const videoId = await servers[0].videos.getId({ uuid: servers[1].store.videoCreated.uuid }) await commands[0].report({ videoId, reason }) @@ -197,8 +195,6 @@ describe('Test abuses', function () { }) it('Should hide video abuses from blocked accounts', async function () { - this.timeout(10000) - { const videoId = await servers[1].videos.getId({ uuid: servers[0].store.videoCreated.uuid }) await commands[1].report({ videoId, reason: 'will mute this' }) @@ -250,8 +246,6 @@ describe('Test abuses', function () { }) it('Should keep the video abuse when deleting the video', async function () { - this.timeout(10000) - await servers[1].videos.remove({ id: abuseServer2.video.uuid }) await waitJobs(servers) @@ -268,8 +262,6 @@ describe('Test abuses', function () { }) it('Should include counts of reports from reporter and reportee', async function () { - this.timeout(10000) - // register a second user to have two reporters/reportees const user = { username: 'user2', password: 'password' } await servers[0].users.create({ ...user }) @@ -307,8 +299,6 @@ describe('Test abuses', function () { }) it('Should list predefined reasons as well as timestamps for the reported video', async function () { - this.timeout(10000) - const reason5 = 'my super bad reason 5' const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ] const createRes = await commands[0].report({ @@ -331,8 +321,6 @@ describe('Test abuses', function () { }) it('Should delete the video abuse', async function () { - this.timeout(10000) - await commands[1].delete({ abuseId: abuseServer2.id }) await waitJobs(servers) @@ -351,8 +339,6 @@ describe('Test abuses', function () { }) it('Should list and filter video abuses', async function () { - this.timeout(10000) - async function list (query: Parameters[0]) { const body = await commands[0].getAdminList(query) @@ -457,8 +443,6 @@ describe('Test abuses', function () { }) it('Should report abuse on a remote comment', async function () { - this.timeout(10000) - const comment = await getComment(servers[0], servers[1].store.videoCreated.uuid) const reason = 'it is a really bad comment' @@ -525,8 +509,6 @@ describe('Test abuses', function () { }) it('Should keep the comment abuse when deleting the comment', async function () { - this.timeout(10000) - const commentServer2 = await getComment(servers[0], servers[1].store.videoCreated.uuid) await servers[0].comments.delete({ videoId: servers[1].store.videoCreated.uuid, commentId: commentServer2.id }) @@ -546,8 +528,6 @@ describe('Test abuses', function () { }) it('Should delete the comment abuse', async function () { - this.timeout(10000) - await commands[1].delete({ abuseId: abuseServer2.id }) await waitJobs(servers) @@ -645,8 +625,6 @@ describe('Test abuses', function () { }) it('Should report abuse on a remote account', async function () { - this.timeout(10000) - const account = await getAccountFromServer(servers[0], 'user_2', servers[1]) const reason = 'it is a really bad account' @@ -699,8 +677,6 @@ describe('Test abuses', function () { }) it('Should keep the account abuse when deleting the account', async function () { - this.timeout(10000) - const account = await getAccountFromServer(servers[1], 'user_2', servers[1]) await servers[1].users.remove({ userId: account.userId }) @@ -715,8 +691,6 @@ describe('Test abuses', function () { }) it('Should delete the account abuse', async function () { - this.timeout(10000) - await commands[1].delete({ abuseId: abuseServer2.id }) 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 () { }) it('Should block an account', async function () { - this.timeout(10000) - await servers[0].blocklist.addToMyBlocklist({ token: userToken1, account: 'user3@' + servers[1].host }) await waitJobs(servers) }) @@ -146,8 +144,6 @@ describe('Test blocklist notifications', function () { }) it('Should block an account', async function () { - this.timeout(10000) - await servers[0].blocklist.addToMyBlocklist({ token: userToken1, server: servers[1].host }) await waitJobs(servers) }) @@ -186,8 +182,6 @@ describe('Test blocklist notifications', function () { }) it('Should block an account', async function () { - this.timeout(10000) - await servers[0].blocklist.addToServerBlocklist({ account: 'user3@' + servers[1].host }) await waitJobs(servers) }) @@ -221,8 +215,6 @@ describe('Test blocklist notifications', function () { }) it('Should block an account', async function () { - this.timeout(10000) - await servers[0].blocklist.addToServerBlocklist({ server: servers[1].host }) await waitJobs(servers) }) 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 () { }) it('Should hide its comments', async function () { - this.timeout(10000) - const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) await waitJobs(servers) @@ -767,8 +765,6 @@ describe('Test blocklist', function () { }) it('Should hide its comments', async function () { - this.timeout(10000) - const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' }) 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 () { describe('Default search', async function () { it('Should make a local videos search by default', async function () { - this.timeout(10000) - await server.config.updateCustomSubConfig({ newConfig: { 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 () { }) it('Should send a contact form', async function () { - this.timeout(10000) - await command.send({ fromEmail: 'toto@example.com', body: 'my super message', @@ -61,8 +59,6 @@ describe('Test contact form', function () { }) it('Should not be able to send another contact form because of the anti spam checker', async function () { - this.timeout(10000) - await wait(1000) 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 () { describe('When creating a user without password', function () { it('Should send a create password email', async function () { - this.timeout(10000) - await server.users.create({ username: 'create_password', password: '' }) await waitJobs(server) @@ -179,8 +177,6 @@ describe('Test emails', function () { describe('When creating an abuse', function () { it('Should send the notification email', async function () { - this.timeout(10000) - const reason = 'my super bad reason' await server.abuses.report({ token: userAccessToken, videoId, reason }) @@ -200,8 +196,6 @@ describe('Test emails', function () { describe('When blocking/unblocking user', function () { it('Should send the notification email when blocking a user', async function () { - this.timeout(10000) - const reason = 'my super bad reason' await server.users.banUser({ userId, reason }) @@ -219,8 +213,6 @@ describe('Test emails', function () { }) it('Should send the notification email when unblocking a user', async function () { - this.timeout(10000) - await server.users.unbanUser({ userId }) await waitJobs(server) @@ -238,8 +230,6 @@ describe('Test emails', function () { describe('When blacklisting a video', function () { it('Should send the notification email', async function () { - this.timeout(10000) - const reason = 'my super reason' await server.blacklist.add({ videoId: videoUserUUID, reason }) @@ -257,8 +247,6 @@ describe('Test emails', function () { }) it('Should send the notification email', async function () { - this.timeout(10000) - await server.blacklist.remove({ videoId: videoUserUUID }) await waitJobs(server) @@ -282,8 +270,6 @@ describe('Test emails', function () { describe('When verifying a user email', function () { it('Should ask to send the verification email', async function () { - this.timeout(10000) - await server.users.askSendVerifyEmail({ email: 'user_1@example.com' }) await waitJobs(server) @@ -337,8 +323,6 @@ describe('Test emails', function () { }) it('Should ask to send the verification email', async function () { - this.timeout(10000) - await server.registrations.askSendVerifyEmail({ email: 'request_1@example.com' }) 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 () { }) it('Should remove follower on server 2', async function () { - this.timeout(10000) - await commands[1].removeFollower({ follower: servers[0] }) await waitJobs(servers) @@ -126,8 +124,6 @@ describe('Test follows moderation', function () { describe('Disabled/Enabled followers', function () { it('Should disable followers on server 2', async function () { - this.timeout(10000) - const subConfig = { followers: { instance: { @@ -146,8 +142,6 @@ describe('Test follows moderation', function () { }) it('Should re enable followers on server 2', async function () { - this.timeout(10000) - const subConfig = { followers: { instance: { @@ -193,8 +187,6 @@ describe('Test follows moderation', function () { }) it('Should accept a follower', async function () { - this.timeout(10000) - await commands[1].acceptFollower({ follower: 'peertube@' + servers[0].host }) await waitJobs(servers) 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 () { }) it('Should log ping requests', async function () { - this.timeout(10000) - const now = new Date() 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 () { }) it('Should have watched settings changes', async function () { - this.timeout(10000) - await server.servers.waitUntilLog('Settings changed!') }) 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 () { }) it('Should succeed with the correct infohash', function (done) { - this.timeout(10000) const webtorrent = new WebTorrent() 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 () { }) it('Should delete videos', async function () { - this.timeout(10000) - for (const uuid of videoUUIDs) { await servers[0].videos.remove({ id: uuid }) } 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 () { }) it('Should be able to change the user email', async function () { - this.timeout(10000) - let updateVerificationString: string { 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 () { }) it('Should be able to update my display name', async function () { - this.timeout(10000) - await servers[0].users.updateMe({ displayName: 'my super display name' }) 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 () { }) it('Should upload the video', async function () { - this.timeout(10000) - const attributes = { name: 'my super name', 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 () { }) it('Should accept the same change ownership request without crashing', async function () { - this.timeout(10000) - await command.create({ token: firstUserToken, videoId: servers[0].store.videoCreated.id, username: secondUser }) }) it('Should not create multiple change ownership requests while one is waiting', async function () { - this.timeout(10000) - const body = await command.list({ token: secondUserToken }) expect(body.total).to.equal(1) @@ -146,14 +142,10 @@ describe('Test video change ownership - nominal', function () { }) it('Should not be possible to refuse the change of ownership from first user', async function () { - this.timeout(10000) - await command.refuse({ token: firstUserToken, ownershipId: lastRequestId, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) }) it('Should be possible to refuse the change of ownership from second user', async function () { - this.timeout(10000) - await command.refuse({ token: secondUserToken, ownershipId: lastRequestId }) }) @@ -184,8 +176,6 @@ describe('Test video change ownership - nominal', function () { }) it('Should not be possible to accept the change of ownership from first user', async function () { - this.timeout(10000) - await command.accept({ token: firstUserToken, ownershipId: lastRequestId, @@ -195,8 +185,6 @@ describe('Test video change ownership - nominal', function () { }) it('Should be possible to accept the change of ownership from second user', async function () { - this.timeout(10000) - await command.accept({ token: secondUserToken, ownershipId: lastRequestId, channelId: secondUserChannelId }) await waitJobs(servers) @@ -309,8 +297,6 @@ describe('Test video change ownership - quota too small', function () { }) it('Should not be possible to accept the change of ownership from second user because of exceeded quota', async function () { - this.timeout(10000) - const { videoChannels } = await server.users.getMyInfo({ token: secondUserToken }) const channelId = videoChannels[0].id 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 () { }) it('Should list the second video channel videos', async function () { - this.timeout(10000) - for (const server of servers) { const channelURI = 'second_video_channel@' + servers[0].host const { total, data } = await server.videos.listByChannel({ handle: channelURI }) @@ -392,16 +390,12 @@ describe('Test video channels', function () { }) it('Should change the video channel of a video', async function () { - this.timeout(10000) - await servers[0].videos.update({ id: videoUUID, attributes: { channelId: servers[0].store.channel.id } }) await waitJobs(servers) }) it('Should list the first video channel videos', async function () { - this.timeout(10000) - for (const server of servers) { { const secondChannelURI = 'second_video_channel@' + servers[0].host @@ -452,8 +446,6 @@ describe('Test video channels', function () { }) it('Should report correct channel views per days', async function () { - this.timeout(10000) - { const { data } = await servers[0].channels.listByAccount({ accountName, withStats: true }) 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 () { }) it('Should update with a short description', async function () { - this.timeout(10000) - const attributes = { description: 'short description' } 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 () { }) it('Should not be able to watch the private video with another user', async function () { - this.timeout(10000) - const user = { username: 'hello', password: 'super password' @@ -254,8 +252,6 @@ describe('Test video privacy', function () { }) it('Should set these videos as private and internal', async function () { - this.timeout(10000) - await servers[0].videos.update({ id: internalVideoId, attributes: { privacy: VideoPrivacy.PRIVATE } }) await servers[0].videos.update({ id: privateVideoId, attributes: { privacy: VideoPrivacy.INTERNAL } }) 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 () { }) it('Should upload a video and schedule an update in 10 seconds', async function () { - this.timeout(10000) - const attributes = { name: 'video 1', privacy: VideoPrivacy.PRIVATE, @@ -89,8 +87,6 @@ describe('Test video update scheduler', function () { }) it('Should upload a video without scheduling an update', async function () { - this.timeout(10000) - const attributes = { name: 'video 2', privacy: VideoPrivacy.PRIVATE @@ -103,8 +99,6 @@ describe('Test video update scheduler', function () { }) it('Should update a video by scheduling an update', async function () { - this.timeout(10000) - const attributes = { name: 'video 2 updated', 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 () { }) it('Should upload another video and include all videos in the overview', async function () { - this.timeout(60000) + this.timeout(120000) { 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 () { }) after(async function () { - this.timeout(10000) - await cleanupTests([ anotherServer ]) }) }) after(async function () { - this.timeout(10000) - await cleanupTests([ server ]) }) }) 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 () { }) it('Should auto block a video', async function () { - this.timeout(10000) - await check(servers[0], server2Videos[0].uuid, true) blocklistServer.replace({ @@ -98,8 +96,6 @@ describe('Official plugin auto-block videos', function () { }) it('Should not block a local video', async function () { - this.timeout(10000) - await check(servers[0], server1Videos[0].uuid, true) blocklistServer.replace({ @@ -116,8 +112,6 @@ describe('Official plugin auto-block videos', function () { }) it('Should remove a video block', async function () { - this.timeout(10000) - await check(servers[0], server2Videos[0].uuid, false) 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 () { }) it('Should add a server blocklist', async function () { - this.timeout(10000) - blocklistServer.replace({ data: [ { @@ -67,8 +65,6 @@ describe('Official plugin auto-mute', function () { }) it('Should remove a server blocklist', async function () { - this.timeout(10000) - blocklistServer.replace({ data: [ { @@ -85,8 +81,6 @@ describe('Official plugin auto-mute', function () { }) it('Should add an account blocklist', async function () { - this.timeout(10000) - blocklistServer.replace({ data: [ { @@ -102,8 +96,6 @@ describe('Official plugin auto-mute', function () { }) it('Should remove an account blocklist', async function () { - this.timeout(10000) - blocklistServer.replace({ data: [ { 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 () { }) it('Should reject token of Kefka by the plugin hook', async function () { - this.timeout(10000) - await wait(5000) 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 () { }) it('Should reject token of laguna by the plugin hook', async function () { - this.timeout(10000) - await wait(5000) 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 () { }) it('Should mute server 2', async function () { - this.timeout(10000) await postCommand(servers[0], 'blockServer', { hostToBlock: servers[1].host }) const { data } = await servers[0].videos.list() @@ -254,8 +253,6 @@ describe('Test plugin helpers', function () { }) it('Should blacklist video', async function () { - this.timeout(10000) - await postCommand(servers[0], 'blacklist', { videoUUID: videoUUIDServer1, unfederate: true }) await waitJobs(servers) @@ -269,8 +266,6 @@ describe('Test plugin helpers', function () { }) it('Should unblacklist video', async function () { - this.timeout(10000) - await postCommand(servers[0], 'unblacklist', { videoUUID: videoUUIDServer1 }) 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 const files = await readdir(directoryPath) - expect(files).to.have.lengthOf(0) + expect(files, 'Directory content: ' + files.join(', ')).to.have.lengthOf(0) } -- cgit v1.2.3