diff options
Diffstat (limited to 'server/tests/api/live/live-permanent.ts')
-rw-r--r-- | server/tests/api/live/live-permanent.ts | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts index 71b7d28a8..b9e37c834 100644 --- a/server/tests/api/live/live-permanent.ts +++ b/server/tests/api/live/live-permanent.ts | |||
@@ -5,10 +5,10 @@ import * as chai from 'chai' | |||
5 | import { LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState } from '@shared/models' | 5 | import { LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState } from '@shared/models' |
6 | import { | 6 | import { |
7 | cleanupTests, | 7 | cleanupTests, |
8 | ConfigCommand, | ||
8 | createLive, | 9 | createLive, |
9 | doubleFollow, | 10 | doubleFollow, |
10 | flushAndRunMultipleServers, | 11 | flushAndRunMultipleServers, |
11 | getCustomConfigResolutions, | ||
12 | getLive, | 12 | getLive, |
13 | getPlaylistsCount, | 13 | getPlaylistsCount, |
14 | getVideo, | 14 | getVideo, |
@@ -17,7 +17,6 @@ import { | |||
17 | setAccessTokensToServers, | 17 | setAccessTokensToServers, |
18 | setDefaultVideoChannel, | 18 | setDefaultVideoChannel, |
19 | stopFfmpeg, | 19 | stopFfmpeg, |
20 | updateCustomSubConfig, | ||
21 | updateLive, | 20 | updateLive, |
22 | wait, | 21 | wait, |
23 | waitJobs, | 22 | waitJobs, |
@@ -63,14 +62,16 @@ describe('Permanent live', function () { | |||
63 | // Server 1 and server 2 follow each other | 62 | // Server 1 and server 2 follow each other |
64 | await doubleFollow(servers[0], servers[1]) | 63 | await doubleFollow(servers[0], servers[1]) |
65 | 64 | ||
66 | await updateCustomSubConfig(servers[0].url, servers[0].accessToken, { | 65 | await servers[0].configCommand.updateCustomSubConfig({ |
67 | live: { | 66 | newConfig: { |
68 | enabled: true, | 67 | live: { |
69 | allowReplay: true, | ||
70 | maxDuration: -1, | ||
71 | transcoding: { | ||
72 | enabled: true, | 68 | enabled: true, |
73 | resolutions: getCustomConfigResolutions(true) | 69 | allowReplay: true, |
70 | maxDuration: -1, | ||
71 | transcoding: { | ||
72 | enabled: true, | ||
73 | resolutions: ConfigCommand.getCustomConfigResolutions(true) | ||
74 | } | ||
74 | } | 75 | } |
75 | } | 76 | } |
76 | }) | 77 | }) |
@@ -145,14 +146,16 @@ describe('Permanent live', function () { | |||
145 | it('Should be able to stream again in the permanent live', async function () { | 146 | it('Should be able to stream again in the permanent live', async function () { |
146 | this.timeout(20000) | 147 | this.timeout(20000) |
147 | 148 | ||
148 | await updateCustomSubConfig(servers[0].url, servers[0].accessToken, { | 149 | await servers[0].configCommand.updateCustomSubConfig({ |
149 | live: { | 150 | newConfig: { |
150 | enabled: true, | 151 | live: { |
151 | allowReplay: true, | ||
152 | maxDuration: -1, | ||
153 | transcoding: { | ||
154 | enabled: true, | 152 | enabled: true, |
155 | resolutions: getCustomConfigResolutions(false) | 153 | allowReplay: true, |
154 | maxDuration: -1, | ||
155 | transcoding: { | ||
156 | enabled: true, | ||
157 | resolutions: ConfigCommand.getCustomConfigResolutions(false) | ||
158 | } | ||
156 | } | 159 | } |
157 | } | 160 | } |
158 | }) | 161 | }) |