diff options
Diffstat (limited to 'server/tests/api/object-storage/videos.ts')
-rw-r--r-- | server/tests/api/object-storage/videos.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts index 1b3c389d7..6862658cc 100644 --- a/server/tests/api/object-storage/videos.ts +++ b/server/tests/api/object-storage/videos.ts | |||
@@ -9,7 +9,7 @@ import { | |||
9 | expectLogDoesNotContain, | 9 | expectLogDoesNotContain, |
10 | expectStartWith, | 10 | expectStartWith, |
11 | generateHighBitrateVideo, | 11 | generateHighBitrateVideo, |
12 | MockObjectStorage | 12 | MockObjectStorageProxy |
13 | } from '@server/tests/shared' | 13 | } from '@server/tests/shared' |
14 | import { areMockObjectStorageTestsDisabled } from '@shared/core-utils' | 14 | import { areMockObjectStorageTestsDisabled } from '@shared/core-utils' |
15 | import { HttpStatusCode, VideoDetails } from '@shared/models' | 15 | import { HttpStatusCode, VideoDetails } from '@shared/models' |
@@ -124,7 +124,7 @@ function runTestSuite (options: { | |||
124 | 124 | ||
125 | useMockBaseUrl?: boolean | 125 | useMockBaseUrl?: boolean |
126 | }) { | 126 | }) { |
127 | const mockObjectStorage = new MockObjectStorage() | 127 | const mockObjectStorageProxy = new MockObjectStorageProxy() |
128 | const { fixture } = options | 128 | const { fixture } = options |
129 | let baseMockUrl: string | 129 | let baseMockUrl: string |
130 | 130 | ||
@@ -138,8 +138,10 @@ function runTestSuite (options: { | |||
138 | before(async function () { | 138 | before(async function () { |
139 | this.timeout(120000) | 139 | this.timeout(120000) |
140 | 140 | ||
141 | const port = await mockObjectStorage.initialize() | 141 | const port = await mockObjectStorageProxy.initialize() |
142 | baseMockUrl = options.useMockBaseUrl ? `http://127.0.0.1:${port}` : undefined | 142 | baseMockUrl = options.useMockBaseUrl |
143 | ? `http://127.0.0.1:${port}` | ||
144 | : undefined | ||
143 | 145 | ||
144 | await ObjectStorageCommand.createMockBucket(options.playlistBucket) | 146 | await ObjectStorageCommand.createMockBucket(options.playlistBucket) |
145 | await ObjectStorageCommand.createMockBucket(options.webtorrentBucket) | 147 | await ObjectStorageCommand.createMockBucket(options.webtorrentBucket) |
@@ -254,7 +256,7 @@ function runTestSuite (options: { | |||
254 | }) | 256 | }) |
255 | 257 | ||
256 | after(async function () { | 258 | after(async function () { |
257 | await mockObjectStorage.terminate() | 259 | await mockObjectStorageProxy.terminate() |
258 | 260 | ||
259 | await cleanupTests(servers) | 261 | await cleanupTests(servers) |
260 | }) | 262 | }) |