diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/live/live.ts | 1 | ||||
-rw-r--r-- | server/tests/api/videos/video-comments.ts | 6 | ||||
-rw-r--r-- | server/tests/api/videos/video-playlists.ts | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index aa2e1318a..94c966c9f 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -10,7 +10,6 @@ import { | |||
10 | checkLiveCleanup, | 10 | checkLiveCleanup, |
11 | checkLiveSegmentHash, | 11 | checkLiveSegmentHash, |
12 | checkResolutionsInMasterPlaylist, | 12 | checkResolutionsInMasterPlaylist, |
13 | checkSegmentHash, | ||
14 | cleanupTests, | 13 | cleanupTests, |
15 | createLive, | 14 | createLive, |
16 | doubleFollow, | 15 | doubleFollow, |
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index 18a86bead..141a80690 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | 1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ |
2 | 2 | ||
3 | import * as chai from 'chai' | ||
4 | import 'mocha' | 3 | import 'mocha' |
5 | import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' | 4 | import * as chai from 'chai' |
5 | |||
6 | import { cleanupTests, testImage } from '../../../../shared/extra-utils' | 6 | import { cleanupTests, testImage } from '../../../../shared/extra-utils' |
7 | import { | 7 | import { |
8 | createUser, | 8 | createUser, |
@@ -22,7 +22,7 @@ import { | |||
22 | getVideoCommentThreads, | 22 | getVideoCommentThreads, |
23 | getVideoThreadComments | 23 | getVideoThreadComments |
24 | } from '../../../../shared/extra-utils/videos/video-comments' | 24 | } from '../../../../shared/extra-utils/videos/video-comments' |
25 | import { isLocalLiveVideoAccepted } from '@server/lib/moderation' | 25 | import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' |
26 | 26 | ||
27 | const expect = chai.expect | 27 | const expect = chai.expect |
28 | 28 | ||
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts index 0bfb5bcd4..b194665ba 100644 --- a/server/tests/api/videos/video-playlists.ts +++ b/server/tests/api/videos/video-playlists.ts | |||
@@ -628,7 +628,7 @@ describe('Test video playlists', function () { | |||
628 | let video3: string | 628 | let video3: string |
629 | 629 | ||
630 | before(async function () { | 630 | before(async function () { |
631 | this.timeout(30000) | 631 | this.timeout(60000) |
632 | 632 | ||
633 | groupUser1 = [ Object.assign({}, servers[0], { accessToken: userAccessTokenServer1 }) ] | 633 | groupUser1 = [ Object.assign({}, servers[0], { accessToken: userAccessTokenServer1 }) ] |
634 | groupWithoutToken1 = [ Object.assign({}, servers[0], { accessToken: undefined }) ] | 634 | groupWithoutToken1 = [ Object.assign({}, servers[0], { accessToken: undefined }) ] |
@@ -656,6 +656,8 @@ describe('Test video playlists', function () { | |||
656 | video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid | 656 | video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid |
657 | video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid | 657 | video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid |
658 | 658 | ||
659 | await waitJobs(servers) | ||
660 | |||
659 | await addVideo({ videoId: video1, startTimestamp: 15, stopTimestamp: 28 }) | 661 | await addVideo({ videoId: video1, startTimestamp: 15, stopTimestamp: 28 }) |
660 | await addVideo({ videoId: video2, startTimestamp: 35 }) | 662 | await addVideo({ videoId: video2, startTimestamp: 35 }) |
661 | await addVideo({ videoId: video3 }) | 663 | await addVideo({ videoId: video3 }) |