1 files changed, 37 insertions, 21 deletions

diff --git a/server/tests/api/object-storage/live.ts b/server/tests/api/object-storage/live.ts
index 7f8db40e5..07ff4763b 100644
--- a/server/tests/api/object-storage/live.ts
+++ b/server/tests/api/object-storage/live.ts
@@ -36,7 +36,14 @@ async function createLive (server: PeerTubeServer, permanent: boolean) {
   return uuid
 }
 
-async function checkFilesExist (servers: PeerTubeServer[], videoUUID: string, numberOfFiles: number) {
+async function checkFilesExist (options: {
+  servers: PeerTubeServer[]
+  videoUUID: string
+  numberOfFiles: number
+  objectStorage: ObjectStorageCommand
+}) {
+  const { servers, videoUUID, numberOfFiles, objectStorage } = options
+
   for (const server of servers) {
     const video = await server.videos.get({ id: videoUUID })
 
@@ -47,14 +54,21 @@ async function checkFilesExist (servers: PeerTubeServer[], videoUUID: string, nu
     expect(files).to.have.lengthOf(numberOfFiles)
 
     for (const file of files) {
-      expectStartWith(file.fileUrl, ObjectStorageCommand.getMockPlaylistBaseUrl())
+      expectStartWith(file.fileUrl, objectStorage.getMockPlaylistBaseUrl())
 
       await makeRawRequest({ url: file.fileUrl, expectedStatus: HttpStatusCode.OK_200 })
     }
   }
 }
 
-async function checkFilesCleanup (server: PeerTubeServer, videoUUID: string, resolutions: number[]) {
+async function checkFilesCleanup (options: {
+  server: PeerTubeServer
+  videoUUID: string
+  resolutions: number[]
+  objectStorage: ObjectStorageCommand
+}) {
+  const { server, videoUUID, resolutions, objectStorage } = options
+
   const resolutionFiles = resolutions.map((_value, i) => `${i}.m3u8`)
 
   for (const playlistName of [ 'master.m3u8' ].concat(resolutionFiles)) {
@@ -62,7 +76,7 @@ async function checkFilesCleanup (server: PeerTubeServer, videoUUID: string, res
       videoUUID,
       playlistName,
       expectedStatus: HttpStatusCode.NOT_FOUND_404,
-      objectStorage: true
+      objectStorage
     })
   }
 
@@ -70,7 +84,7 @@ async function checkFilesCleanup (server: PeerTubeServer, videoUUID: string, res
     videoUUID,
     playlistNumber: 0,
     segment: 0,
-    objectStorage: true,
+    objectStorage,
     expectedStatus: HttpStatusCode.NOT_FOUND_404
   })
 }
@@ -80,13 +94,13 @@ describe('Object storage for lives', function () {
 
   let servers: PeerTubeServer[]
   let sqlCommandServer1: SQLCommand
+  const objectStorage = new ObjectStorageCommand()
 
   before(async function () {
     this.timeout(120000)
 
-    await ObjectStorageCommand.prepareDefaultMockBuckets()
-
-    servers = await createMultipleServers(2, ObjectStorageCommand.getDefaultMockConfig())
+    await objectStorage.prepareDefaultMockBuckets()
+    servers = await createMultipleServers(2, objectStorage.getDefaultMockConfig())
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
@@ -119,7 +133,7 @@ describe('Object storage for lives', function () {
         liveVideoId: videoUUID,
         resolutions: [ 720 ],
         transcoded: false,
-        objectStorage: true
+        objectStorage
       })
 
       await stopFfmpeg(ffmpegCommand)
@@ -131,11 +145,11 @@ describe('Object storage for lives', function () {
       await waitUntilLiveReplacedByReplayOnAllServers(servers, videoUUID)
       await waitJobs(servers)
 
-      await checkFilesExist(servers, videoUUID, 1)
+      await checkFilesExist({ servers, videoUUID, numberOfFiles: 1, objectStorage })
     })
 
     it('Should have cleaned up live files from object storage', async function () {
-      await checkFilesCleanup(servers[0], videoUUID, [ 720 ])
+      await checkFilesCleanup({ server: servers[0], videoUUID, resolutions: [ 720 ], objectStorage })
     })
   })
 
@@ -166,7 +180,7 @@ describe('Object storage for lives', function () {
           liveVideoId: videoUUIDNonPermanent,
           resolutions,
           transcoded: true,
-          objectStorage: true
+          objectStorage
         })
 
         await stopFfmpeg(ffmpegCommand)
@@ -178,11 +192,11 @@ describe('Object storage for lives', function () {
         await waitUntilLiveReplacedByReplayOnAllServers(servers, videoUUIDNonPermanent)
         await waitJobs(servers)
 
-        await checkFilesExist(servers, videoUUIDNonPermanent, 5)
+        await checkFilesExist({ servers, videoUUID: videoUUIDNonPermanent, numberOfFiles: 5, objectStorage })
       })
 
       it('Should have cleaned up live files from object storage', async function () {
-        await checkFilesCleanup(servers[0], videoUUIDNonPermanent, resolutions)
+        await checkFilesCleanup({ server: servers[0], videoUUID: videoUUIDNonPermanent, resolutions, objectStorage })
       })
     })
 
@@ -206,7 +220,7 @@ describe('Object storage for lives', function () {
           liveVideoId: videoUUIDPermanent,
           resolutions,
           transcoded: true,
-          objectStorage: true
+          objectStorage
         })
 
         await stopFfmpeg(ffmpegCommand)
@@ -221,11 +235,11 @@ describe('Object storage for lives', function () {
         const videoLiveDetails = await servers[0].videos.get({ id: videoUUIDPermanent })
         const replay = await findExternalSavedVideo(servers[0], videoLiveDetails)
 
-        await checkFilesExist(servers, replay.uuid, 5)
+        await checkFilesExist({ servers, videoUUID: replay.uuid, numberOfFiles: 5, objectStorage })
       })
 
       it('Should have cleaned up live files from object storage', async function () {
-        await checkFilesCleanup(servers[0], videoUUIDPermanent, resolutions)
+        await checkFilesCleanup({ server: servers[0], videoUUID: videoUUIDPermanent, resolutions, objectStorage })
       })
     })
   })
@@ -238,9 +252,10 @@ describe('Object storage for lives', function () {
       this.timeout(120000)
 
       const port = await mockObjectStorageProxy.initialize()
-      baseMockUrl = `http://127.0.0.1:${port}/streaming-playlists`
+      const bucketName = objectStorage.getMockStreamingPlaylistsBucketName()
+      baseMockUrl = `http://127.0.0.1:${port}/${bucketName}`
 
-      await ObjectStorageCommand.createMockBucket('streaming-playlists')
+      await objectStorage.prepareDefaultMockBuckets()
 
       const config = {
         object_storage: {
@@ -251,7 +266,7 @@ describe('Object storage for lives', function () {
           credentials: ObjectStorageCommand.getMockCredentialsConfig(),
 
           streaming_playlists: {
-            bucket_name: 'streaming-playlists',
+            bucket_name: bucketName,
             prefix: '',
             base_url: baseMockUrl
           }
@@ -279,7 +294,7 @@ describe('Object storage for lives', function () {
         liveVideoId: videoUUIDPermanent,
         resolutions: [ 720 ],
         transcoded: true,
-        objectStorage: true,
+        objectStorage,
         objectStorageBaseUrl: baseMockUrl
       })
 
@@ -289,6 +304,7 @@ describe('Object storage for lives', function () {
 
   after(async function () {
     await sqlCommandServer1.cleanup()
+    await objectStorage.cleanupMock()
 
     await cleanupTests(servers)
   })