diff options
Diffstat (limited to 'server/tests/api')
-rw-r--r-- | server/tests/api/live/live.ts | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index c795f201a..b41b5fc2e 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -3,18 +3,16 @@ | |||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { getLiveNotificationSocket } from '@shared/extra-utils/socket/socket-io' | 5 | import { getLiveNotificationSocket } from '@shared/extra-utils/socket/socket-io' |
6 | import { LiveVideo, LiveVideoCreate, User, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' | 6 | import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' |
7 | import { | 7 | import { |
8 | addVideoToBlacklist, | 8 | addVideoToBlacklist, |
9 | checkLiveCleanup, | 9 | checkLiveCleanup, |
10 | checkResolutionsInMasterPlaylist, | 10 | checkResolutionsInMasterPlaylist, |
11 | cleanupTests, | 11 | cleanupTests, |
12 | createLive, | 12 | createLive, |
13 | createUser, | ||
14 | doubleFollow, | 13 | doubleFollow, |
15 | flushAndRunMultipleServers, | 14 | flushAndRunMultipleServers, |
16 | getLive, | 15 | getLive, |
17 | getMyUserInformation, | ||
18 | getVideo, | 16 | getVideo, |
19 | getVideoIdFromUUID, | 17 | getVideoIdFromUUID, |
20 | getVideosList, | 18 | getVideosList, |
@@ -30,7 +28,6 @@ import { | |||
30 | testImage, | 28 | testImage, |
31 | updateCustomSubConfig, | 29 | updateCustomSubConfig, |
32 | updateLive, | 30 | updateLive, |
33 | userLogin, | ||
34 | waitJobs, | 31 | waitJobs, |
35 | waitUntilLiveStarts | 32 | waitUntilLiveStarts |
36 | } from '../../../../shared/extra-utils' | 33 | } from '../../../../shared/extra-utils' |
@@ -39,9 +36,6 @@ const expect = chai.expect | |||
39 | 36 | ||
40 | describe('Test live', function () { | 37 | describe('Test live', function () { |
41 | let servers: ServerInfo[] = [] | 38 | let servers: ServerInfo[] = [] |
42 | let userId: number | ||
43 | let userAccessToken: string | ||
44 | let userChannelId: number | ||
45 | 39 | ||
46 | before(async function () { | 40 | before(async function () { |
47 | this.timeout(120000) | 41 | this.timeout(120000) |
@@ -62,22 +56,6 @@ describe('Test live', function () { | |||
62 | } | 56 | } |
63 | }) | 57 | }) |
64 | 58 | ||
65 | { | ||
66 | const user = { username: 'user1', password: 'superpassword' } | ||
67 | const res = await createUser({ | ||
68 | url: servers[0].url, | ||
69 | accessToken: servers[0].accessToken, | ||
70 | username: user.username, | ||
71 | password: user.password | ||
72 | }) | ||
73 | userId = res.body.user.id | ||
74 | |||
75 | userAccessToken = await userLogin(servers[0], user) | ||
76 | |||
77 | const resMe = await getMyUserInformation(servers[0].url, userAccessToken) | ||
78 | userChannelId = (resMe.body as User).videoChannels[0].id | ||
79 | } | ||
80 | |||
81 | // Server 1 and server 2 follow each other | 59 | // Server 1 and server 2 follow each other |
82 | await doubleFollow(servers[0], servers[1]) | 60 | await doubleFollow(servers[0], servers[1]) |
83 | }) | 61 | }) |