aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api/transcoding/video-studio.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-23 10:49:45 +0200
committerChocobozzz <me@florianbigard.com>2023-05-23 10:49:45 +0200
commitf89189907bbdff6c4bc6d3460ed9ef4c49515f17 (patch)
treec55e50e3fc02ae9b3f2d1d19d95160af98cc7d7c /server/tests/api/transcoding/video-studio.ts
parent41cde76bbf5ac16a90b5f158672523069db74009 (diff)
downloadPeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.tar.gz
PeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.tar.zst
PeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.zip
Prevent object storage mock conflicts
When running tests in parallel
Diffstat (limited to 'server/tests/api/transcoding/video-studio.ts')
-rw-r--r--server/tests/api/transcoding/video-studio.ts14
1 files changed, 10 insertions, 4 deletions
diff --git a/server/tests/api/transcoding/video-studio.ts b/server/tests/api/transcoding/video-studio.ts
index 35efc3d49..d1298caf7 100644
--- a/server/tests/api/transcoding/video-studio.ts
+++ b/server/tests/api/transcoding/video-studio.ts
@@ -326,11 +326,13 @@ describe('Test video studio', function () {
326 describe('Object storage studio edition', function () { 326 describe('Object storage studio edition', function () {
327 if (areMockObjectStorageTestsDisabled()) return 327 if (areMockObjectStorageTestsDisabled()) return
328 328
329 const objectStorage = new ObjectStorageCommand()
330
329 before(async function () { 331 before(async function () {
330 await ObjectStorageCommand.prepareDefaultMockBuckets() 332 await objectStorage.prepareDefaultMockBuckets()
331 333
332 await servers[0].kill() 334 await servers[0].kill()
333 await servers[0].run(ObjectStorageCommand.getDefaultMockConfig()) 335 await servers[0].run(objectStorage.getDefaultMockConfig())
334 336
335 await servers[0].config.enableMinimumTranscoding() 337 await servers[0].config.enableMinimumTranscoding()
336 }) 338 })
@@ -353,16 +355,20 @@ describe('Test video studio', function () {
353 } 355 }
354 356
355 for (const webtorrentFile of video.files) { 357 for (const webtorrentFile of video.files) {
356 expectStartWith(webtorrentFile.fileUrl, ObjectStorageCommand.getMockWebTorrentBaseUrl()) 358 expectStartWith(webtorrentFile.fileUrl, objectStorage.getMockWebVideosBaseUrl())
357 } 359 }
358 360
359 for (const hlsFile of video.streamingPlaylists[0].files) { 361 for (const hlsFile of video.streamingPlaylists[0].files) {
360 expectStartWith(hlsFile.fileUrl, ObjectStorageCommand.getMockPlaylistBaseUrl()) 362 expectStartWith(hlsFile.fileUrl, objectStorage.getMockPlaylistBaseUrl())
361 } 363 }
362 364
363 await checkVideoDuration(server, videoUUID, 9) 365 await checkVideoDuration(server, videoUUID, 9)
364 } 366 }
365 }) 367 })
368
369 after(async function () {
370 await objectStorage.cleanupMock()
371 })
366 }) 372 })
367 373
368 after(async function () { 374 after(async function () {