aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/peertube-runner
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-07-28 16:06:49 +0200
committerChocobozzz <me@florianbigard.com>2023-07-28 16:06:49 +0200
commit74c8d5bf2d807870ed351fb2a0ee7137987aa995 (patch)
treedc4493ac1afe6b9033753741997318befa828940 /server/tests/peertube-runner
parente390107e5acffda6b6fa994be1f2874183bab40c (diff)
downloadPeerTube-74c8d5bf2d807870ed351fb2a0ee7137987aa995.tar.gz
PeerTube-74c8d5bf2d807870ed351fb2a0ee7137987aa995.tar.zst
PeerTube-74c8d5bf2d807870ed351fb2a0ee7137987aa995.zip
Refactor enableTranscoding command helpers
Diffstat (limited to 'server/tests/peertube-runner')
-rw-r--r--server/tests/peertube-runner/live-transcoding.ts4
-rw-r--r--server/tests/peertube-runner/studio-transcoding.ts2
-rw-r--r--server/tests/peertube-runner/vod-transcoding.ts14
3 files changed, 10 insertions, 10 deletions
diff --git a/server/tests/peertube-runner/live-transcoding.ts b/server/tests/peertube-runner/live-transcoding.ts
index 4826c61f7..41b01f8d5 100644
--- a/server/tests/peertube-runner/live-transcoding.ts
+++ b/server/tests/peertube-runner/live-transcoding.ts
@@ -139,7 +139,7 @@ describe('Test Live transcoding in peertube-runner program', function () {
139 sqlCommandServer1 = new SQLCommand(servers[0]) 139 sqlCommandServer1 = new SQLCommand(servers[0])
140 140
141 await servers[0].config.enableRemoteTranscoding() 141 await servers[0].config.enableRemoteTranscoding()
142 await servers[0].config.enableTranscoding(true, true, true) 142 await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true })
143 await servers[0].config.enableLive({ allowReplay: true, resolutions: 'max', transcoding: true }) 143 await servers[0].config.enableLive({ allowReplay: true, resolutions: 'max', transcoding: true })
144 144
145 const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() 145 const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken()
@@ -152,7 +152,7 @@ describe('Test Live transcoding in peertube-runner program', function () {
152 describe('With lives on local filesystem storage', function () { 152 describe('With lives on local filesystem storage', function () {
153 153
154 before(async function () { 154 before(async function () {
155 await servers[0].config.enableTranscoding(true, false, true) 155 await servers[0].config.enableTranscoding({ webVideo: true, hls: false, with0p: true })
156 }) 156 })
157 157
158 runSuite() 158 runSuite()
diff --git a/server/tests/peertube-runner/studio-transcoding.ts b/server/tests/peertube-runner/studio-transcoding.ts
index c265d7934..56bfef897 100644
--- a/server/tests/peertube-runner/studio-transcoding.ts
+++ b/server/tests/peertube-runner/studio-transcoding.ts
@@ -68,7 +68,7 @@ describe('Test studio transcoding in peertube-runner program', function () {
68 68
69 await doubleFollow(servers[0], servers[1]) 69 await doubleFollow(servers[0], servers[1])
70 70
71 await servers[0].config.enableTranscoding(true, true) 71 await servers[0].config.enableTranscoding({ hls: true, webVideo: true })
72 await servers[0].config.enableStudio() 72 await servers[0].config.enableStudio()
73 await servers[0].config.enableRemoteStudio() 73 await servers[0].config.enableRemoteStudio()
74 74
diff --git a/server/tests/peertube-runner/vod-transcoding.ts b/server/tests/peertube-runner/vod-transcoding.ts
index eef6faf4e..b3b62e5e0 100644
--- a/server/tests/peertube-runner/vod-transcoding.ts
+++ b/server/tests/peertube-runner/vod-transcoding.ts
@@ -201,7 +201,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
201 expect(getAllFiles(video)).to.have.lengthOf(1) 201 expect(getAllFiles(video)).to.have.lengthOf(1)
202 } 202 }
203 203
204 await servers[0].config.enableTranscoding(true, true, true) 204 await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true })
205 205
206 await servers[0].videos.runTranscoding({ transcodingType: 'web-video', videoId: uuid }) 206 await servers[0].videos.runTranscoding({ transcodingType: 'web-video', videoId: uuid })
207 await waitJobs(servers, { runnerJobs: true }) 207 await waitJobs(servers, { runnerJobs: true })
@@ -259,7 +259,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
259 describe('Web video only enabled', function () { 259 describe('Web video only enabled', function () {
260 260
261 before(async function () { 261 before(async function () {
262 await servers[0].config.enableTranscoding(true, false, true) 262 await servers[0].config.enableTranscoding({ webVideo: true, hls: false, with0p: true })
263 }) 263 })
264 264
265 runSuite({ webVideoEnabled: true, hlsEnabled: false }) 265 runSuite({ webVideoEnabled: true, hlsEnabled: false })
@@ -268,7 +268,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
268 describe('HLS videos only enabled', function () { 268 describe('HLS videos only enabled', function () {
269 269
270 before(async function () { 270 before(async function () {
271 await servers[0].config.enableTranscoding(false, true, true) 271 await servers[0].config.enableTranscoding({ webVideo: false, hls: true, with0p: true })
272 }) 272 })
273 273
274 runSuite({ webVideoEnabled: false, hlsEnabled: true }) 274 runSuite({ webVideoEnabled: false, hlsEnabled: true })
@@ -277,7 +277,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
277 describe('Web video & HLS enabled', function () { 277 describe('Web video & HLS enabled', function () {
278 278
279 before(async function () { 279 before(async function () {
280 await servers[0].config.enableTranscoding(true, true, true) 280 await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true })
281 }) 281 })
282 282
283 runSuite({ webVideoEnabled: true, hlsEnabled: true }) 283 runSuite({ webVideoEnabled: true, hlsEnabled: true })
@@ -303,7 +303,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
303 describe('Web video only enabled', function () { 303 describe('Web video only enabled', function () {
304 304
305 before(async function () { 305 before(async function () {
306 await servers[0].config.enableTranscoding(true, false, true) 306 await servers[0].config.enableTranscoding({ webVideo: true, hls: false, with0p: true })
307 }) 307 })
308 308
309 runSuite({ webVideoEnabled: true, hlsEnabled: false, objectStorage }) 309 runSuite({ webVideoEnabled: true, hlsEnabled: false, objectStorage })
@@ -312,7 +312,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
312 describe('HLS videos only enabled', function () { 312 describe('HLS videos only enabled', function () {
313 313
314 before(async function () { 314 before(async function () {
315 await servers[0].config.enableTranscoding(false, true, true) 315 await servers[0].config.enableTranscoding({ webVideo: false, hls: true, with0p: true })
316 }) 316 })
317 317
318 runSuite({ webVideoEnabled: false, hlsEnabled: true, objectStorage }) 318 runSuite({ webVideoEnabled: false, hlsEnabled: true, objectStorage })
@@ -321,7 +321,7 @@ describe('Test VOD transcoding in peertube-runner program', function () {
321 describe('Web video & HLS enabled', function () { 321 describe('Web video & HLS enabled', function () {
322 322
323 before(async function () { 323 before(async function () {
324 await servers[0].config.enableTranscoding(true, true, true) 324 await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true })
325 }) 325 })
326 326
327 runSuite({ webVideoEnabled: true, hlsEnabled: true, objectStorage }) 327 runSuite({ webVideoEnabled: true, hlsEnabled: true, objectStorage })