diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-25 13:14:34 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-05-25 13:14:34 +0200 |
commit | 819b656439e5f0ec2ae5de9357502cdfe3196197 (patch) | |
tree | 1d15bb0f968f6e58945715bc926cf1b4961333f3 | |
parent | c4d125527a433db9ba536bf3bb8ef19569a85a73 (diff) | |
parent | fc8f15d202e715667c5b726b4f3e7d252381c6d0 (diff) | |
download | PeerTube-819b656439e5f0ec2ae5de9357502cdfe3196197.tar.gz PeerTube-819b656439e5f0ec2ae5de9357502cdfe3196197.tar.zst PeerTube-819b656439e5f0ec2ae5de9357502cdfe3196197.zip |
Merge branch 'release/3.2.0' into develop
-rw-r--r-- | server/tests/plugins/plugin-transcoding.ts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts index c834b6985..eefb2294d 100644 --- a/server/tests/plugins/plugin-transcoding.ts +++ b/server/tests/plugins/plugin-transcoding.ts | |||
@@ -125,7 +125,7 @@ describe('Test transcoding plugins', function () { | |||
125 | }) | 125 | }) |
126 | 126 | ||
127 | it('Should not use the plugin profile if not chosen by the admin', async function () { | 127 | it('Should not use the plugin profile if not chosen by the admin', async function () { |
128 | this.timeout(120000) | 128 | this.timeout(240000) |
129 | 129 | ||
130 | const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid | 130 | const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid |
131 | await waitJobs([ server ]) | 131 | await waitJobs([ server ]) |
@@ -134,7 +134,7 @@ describe('Test transcoding plugins', function () { | |||
134 | }) | 134 | }) |
135 | 135 | ||
136 | it('Should use the vod profile', async function () { | 136 | it('Should use the vod profile', async function () { |
137 | this.timeout(120000) | 137 | this.timeout(240000) |
138 | 138 | ||
139 | await updateConf(server, 'low-vod', 'default') | 139 | await updateConf(server, 'low-vod', 'default') |
140 | 140 | ||
@@ -145,7 +145,7 @@ describe('Test transcoding plugins', function () { | |||
145 | }) | 145 | }) |
146 | 146 | ||
147 | it('Should apply input options in vod profile', async function () { | 147 | it('Should apply input options in vod profile', async function () { |
148 | this.timeout(120000) | 148 | this.timeout(240000) |
149 | 149 | ||
150 | await updateConf(server, 'input-options-vod', 'default') | 150 | await updateConf(server, 'input-options-vod', 'default') |
151 | 151 | ||
@@ -156,7 +156,7 @@ describe('Test transcoding plugins', function () { | |||
156 | }) | 156 | }) |
157 | 157 | ||
158 | it('Should apply the scale filter in vod profile', async function () { | 158 | it('Should apply the scale filter in vod profile', async function () { |
159 | this.timeout(120000) | 159 | this.timeout(240000) |
160 | 160 | ||
161 | await updateConf(server, 'bad-scale-vod', 'default') | 161 | await updateConf(server, 'bad-scale-vod', 'default') |
162 | 162 | ||
@@ -172,7 +172,7 @@ describe('Test transcoding plugins', function () { | |||
172 | }) | 172 | }) |
173 | 173 | ||
174 | it('Should not use the plugin profile if not chosen by the admin', async function () { | 174 | it('Should not use the plugin profile if not chosen by the admin', async function () { |
175 | this.timeout(120000) | 175 | this.timeout(240000) |
176 | 176 | ||
177 | const liveVideoId = await createLiveWrapper(server) | 177 | const liveVideoId = await createLiveWrapper(server) |
178 | 178 | ||
@@ -184,7 +184,7 @@ describe('Test transcoding plugins', function () { | |||
184 | }) | 184 | }) |
185 | 185 | ||
186 | it('Should use the live profile', async function () { | 186 | it('Should use the live profile', async function () { |
187 | this.timeout(120000) | 187 | this.timeout(240000) |
188 | 188 | ||
189 | await updateConf(server, 'low-vod', 'low-live') | 189 | await updateConf(server, 'low-vod', 'low-live') |
190 | 190 | ||
@@ -198,7 +198,7 @@ describe('Test transcoding plugins', function () { | |||
198 | }) | 198 | }) |
199 | 199 | ||
200 | it('Should apply the input options on live profile', async function () { | 200 | it('Should apply the input options on live profile', async function () { |
201 | this.timeout(120000) | 201 | this.timeout(240000) |
202 | 202 | ||
203 | await updateConf(server, 'low-vod', 'input-options-live') | 203 | await updateConf(server, 'low-vod', 'input-options-live') |
204 | 204 | ||
@@ -212,7 +212,7 @@ describe('Test transcoding plugins', function () { | |||
212 | }) | 212 | }) |
213 | 213 | ||
214 | it('Should apply the scale filter name on live profile', async function () { | 214 | it('Should apply the scale filter name on live profile', async function () { |
215 | this.timeout(120000) | 215 | this.timeout(240000) |
216 | 216 | ||
217 | await updateConf(server, 'low-vod', 'bad-scale-live') | 217 | await updateConf(server, 'low-vod', 'bad-scale-live') |
218 | 218 | ||
@@ -223,7 +223,7 @@ describe('Test transcoding plugins', function () { | |||
223 | }) | 223 | }) |
224 | 224 | ||
225 | it('Should default to the default profile if the specified profile does not exist', async function () { | 225 | it('Should default to the default profile if the specified profile does not exist', async function () { |
226 | this.timeout(120000) | 226 | this.timeout(240000) |
227 | 227 | ||
228 | await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-transcoding-one' }) | 228 | await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-transcoding-one' }) |
229 | 229 | ||
@@ -268,7 +268,7 @@ describe('Test transcoding plugins', function () { | |||
268 | }) | 268 | }) |
269 | 269 | ||
270 | it('Should use the new live encoders', async function () { | 270 | it('Should use the new live encoders', async function () { |
271 | this.timeout(120000) | 271 | this.timeout(240000) |
272 | 272 | ||
273 | const liveVideoId = await createLiveWrapper(server) | 273 | const liveVideoId = await createLiveWrapper(server) |
274 | 274 | ||