From f89189907bbdff6c4bc6d3460ed9ef4c49515f17 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 23 May 2023 10:49:45 +0200 Subject: Prevent object storage mock conflicts When running tests in parallel --- server/tests/api/object-storage/video-imports.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'server/tests/api/object-storage/video-imports.ts') diff --git a/server/tests/api/object-storage/video-imports.ts b/server/tests/api/object-storage/video-imports.ts index d5fd91b6a..57150e5a6 100644 --- a/server/tests/api/object-storage/video-imports.ts +++ b/server/tests/api/object-storage/video-imports.ts @@ -32,13 +32,14 @@ describe('Object storage for video import', function () { if (areMockObjectStorageTestsDisabled()) return let server: PeerTubeServer + const objectStorage = new ObjectStorageCommand() before(async function () { this.timeout(120000) - await ObjectStorageCommand.prepareDefaultMockBuckets() + await objectStorage.prepareDefaultMockBuckets() - server = await createSingleServer(1, ObjectStorageCommand.getDefaultMockConfig()) + server = await createSingleServer(1, objectStorage.getDefaultMockConfig()) await setAccessTokensToServers([ server ]) await setDefaultVideoChannel([ server ]) @@ -64,7 +65,7 @@ describe('Object storage for video import', function () { expect(video.streamingPlaylists).to.have.lengthOf(0) const fileUrl = video.files[0].fileUrl - expectStartWith(fileUrl, ObjectStorageCommand.getMockWebTorrentBaseUrl()) + expectStartWith(fileUrl, objectStorage.getMockWebVideosBaseUrl()) await makeRawRequest({ url: fileUrl, expectedStatus: HttpStatusCode.OK_200 }) }) @@ -89,13 +90,13 @@ describe('Object storage for video import', function () { expect(video.streamingPlaylists[0].files).to.have.lengthOf(5) for (const file of video.files) { - expectStartWith(file.fileUrl, ObjectStorageCommand.getMockWebTorrentBaseUrl()) + expectStartWith(file.fileUrl, objectStorage.getMockWebVideosBaseUrl()) await makeRawRequest({ url: file.fileUrl, expectedStatus: HttpStatusCode.OK_200 }) } for (const file of video.streamingPlaylists[0].files) { - expectStartWith(file.fileUrl, ObjectStorageCommand.getMockPlaylistBaseUrl()) + expectStartWith(file.fileUrl, objectStorage.getMockPlaylistBaseUrl()) await makeRawRequest({ url: file.fileUrl, expectedStatus: HttpStatusCode.OK_200 }) } @@ -103,6 +104,8 @@ describe('Object storage for video import', function () { }) after(async function () { + await objectStorage.cleanupMock() + await cleanupTests([ server ]) }) }) -- cgit v1.2.3