diff options
author | Chocobozzz <me@florianbigard.com> | 2022-10-19 10:43:53 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-10-24 14:48:24 +0200 |
commit | 9ab330b90decf4edf152ff8e1d2948c065766b2c (patch) | |
tree | 29d924f50f7307e8e828a57ecb9ea78623487ce0 /server/tests/api/transcoding/hls.ts | |
parent | 3545e72c686ff1725bbdfd8d16d693e2f4aa75a3 (diff) | |
download | PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.tar.gz PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.tar.zst PeerTube-9ab330b90decf4edf152ff8e1d2948c065766b2c.zip |
Use private ACL for private videos in s3
Diffstat (limited to 'server/tests/api/transcoding/hls.ts')
-rw-r--r-- | server/tests/api/transcoding/hls.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/tests/api/transcoding/hls.ts b/server/tests/api/transcoding/hls.ts index 7b5492cd4..84a53c0bd 100644 --- a/server/tests/api/transcoding/hls.ts +++ b/server/tests/api/transcoding/hls.ts | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | import { join } from 'path' | 3 | import { join } from 'path' |
4 | import { checkDirectoryIsEmpty, checkTmpIsEmpty, completeCheckHlsPlaylist } from '@server/tests/shared' | 4 | import { checkDirectoryIsEmpty, checkTmpIsEmpty, completeCheckHlsPlaylist } from '@server/tests/shared' |
5 | import { areObjectStorageTestsDisabled } from '@shared/core-utils' | 5 | import { areMockObjectStorageTestsDisabled } from '@shared/core-utils' |
6 | import { HttpStatusCode } from '@shared/models' | 6 | import { HttpStatusCode } from '@shared/models' |
7 | import { | 7 | import { |
8 | cleanupTests, | 8 | cleanupTests, |
@@ -150,19 +150,19 @@ describe('Test HLS videos', function () { | |||
150 | }) | 150 | }) |
151 | 151 | ||
152 | describe('With object storage enabled', function () { | 152 | describe('With object storage enabled', function () { |
153 | if (areObjectStorageTestsDisabled()) return | 153 | if (areMockObjectStorageTestsDisabled()) return |
154 | 154 | ||
155 | before(async function () { | 155 | before(async function () { |
156 | this.timeout(120000) | 156 | this.timeout(120000) |
157 | 157 | ||
158 | const configOverride = ObjectStorageCommand.getDefaultConfig() | 158 | const configOverride = ObjectStorageCommand.getDefaultMockConfig() |
159 | await ObjectStorageCommand.prepareDefaultBuckets() | 159 | await ObjectStorageCommand.prepareDefaultMockBuckets() |
160 | 160 | ||
161 | await servers[0].kill() | 161 | await servers[0].kill() |
162 | await servers[0].run(configOverride) | 162 | await servers[0].run(configOverride) |
163 | }) | 163 | }) |
164 | 164 | ||
165 | runTestSuite(true, ObjectStorageCommand.getPlaylistBaseUrl()) | 165 | runTestSuite(true, ObjectStorageCommand.getMockPlaylistBaseUrl()) |
166 | }) | 166 | }) |
167 | 167 | ||
168 | after(async function () { | 168 | after(async function () { |