diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/object-storage/videos.ts | 8 | ||||
-rw-r--r-- | server/tests/api/redundancy/redundancy.ts | 2 | ||||
-rw-r--r-- | server/tests/api/transcoding/hls.ts | 4 | ||||
-rw-r--r-- | server/tests/api/transcoding/transcoder.ts | 2 | ||||
-rw-r--r-- | server/tests/cli/create-move-video-storage-job.ts | 4 | ||||
-rw-r--r-- | server/tests/cli/prune-storage.ts | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts index c4f72bbe4..dcc52ef06 100644 --- a/server/tests/api/object-storage/videos.ts +++ b/server/tests/api/object-storage/videos.ts | |||
@@ -181,7 +181,7 @@ function runTestSuite (options: { | |||
181 | : undefined | 181 | : undefined |
182 | }, | 182 | }, |
183 | 183 | ||
184 | videos: { | 184 | web_videos: { |
185 | bucket_name: options.webVideoBucket, | 185 | bucket_name: options.webVideoBucket, |
186 | prefix: options.webVideoPrefix, | 186 | prefix: options.webVideoPrefix, |
187 | base_url: baseMockUrl | 187 | base_url: baseMockUrl |
@@ -308,7 +308,7 @@ describe('Object storage for videos', function () { | |||
308 | bucket_name: 'aaa' | 308 | bucket_name: 'aaa' |
309 | }, | 309 | }, |
310 | 310 | ||
311 | videos: { | 311 | web_videos: { |
312 | bucket_name: 'aaa' | 312 | bucket_name: 'aaa' |
313 | } | 313 | } |
314 | } | 314 | } |
@@ -386,7 +386,7 @@ describe('Object storage for videos', function () { | |||
386 | describe('Test simple object storage', function () { | 386 | describe('Test simple object storage', function () { |
387 | runTestSuite({ | 387 | runTestSuite({ |
388 | playlistBucket: objectStorage.getMockBucketName('streaming-playlists'), | 388 | playlistBucket: objectStorage.getMockBucketName('streaming-playlists'), |
389 | webVideoBucket: objectStorage.getMockBucketName('videos') | 389 | webVideoBucket: objectStorage.getMockBucketName('web-videos') |
390 | }) | 390 | }) |
391 | }) | 391 | }) |
392 | 392 | ||
@@ -431,7 +431,7 @@ describe('Object storage for videos', function () { | |||
431 | runTestSuite({ | 431 | runTestSuite({ |
432 | maxUploadPart, | 432 | maxUploadPart, |
433 | playlistBucket: objectStorage.getMockBucketName('streaming-playlists'), | 433 | playlistBucket: objectStorage.getMockBucketName('streaming-playlists'), |
434 | webVideoBucket: objectStorage.getMockBucketName('videos'), | 434 | webVideoBucket: objectStorage.getMockBucketName('web-videos'), |
435 | fixture | 435 | fixture |
436 | }) | 436 | }) |
437 | }) | 437 | }) |
diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index 9a8cb4f51..85da6acf5 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts | |||
@@ -160,7 +160,7 @@ async function check2Webseeds (videoUUID?: string) { | |||
160 | 160 | ||
161 | const directories = [ | 161 | const directories = [ |
162 | servers[0].getDirectoryPath('redundancy'), | 162 | servers[0].getDirectoryPath('redundancy'), |
163 | servers[1].getDirectoryPath('videos') | 163 | servers[1].getDirectoryPath('web-videos') |
164 | ] | 164 | ] |
165 | 165 | ||
166 | for (const directory of directories) { | 166 | for (const directory of directories) { |
diff --git a/server/tests/api/transcoding/hls.ts b/server/tests/api/transcoding/hls.ts index 0d2fc0fba..d67043c2a 100644 --- a/server/tests/api/transcoding/hls.ts +++ b/server/tests/api/transcoding/hls.ts | |||
@@ -75,8 +75,8 @@ describe('Test HLS videos', function () { | |||
75 | 75 | ||
76 | it('Should have the playlists/segment deleted from the disk', async function () { | 76 | it('Should have the playlists/segment deleted from the disk', async function () { |
77 | for (const server of servers) { | 77 | for (const server of servers) { |
78 | await checkDirectoryIsEmpty(server, 'videos', [ 'private' ]) | 78 | await checkDirectoryIsEmpty(server, 'web-videos', [ 'private' ]) |
79 | await checkDirectoryIsEmpty(server, join('videos', 'private')) | 79 | await checkDirectoryIsEmpty(server, join('web-videos', 'private')) |
80 | 80 | ||
81 | await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls'), [ 'private' ]) | 81 | await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls'), [ 'private' ]) |
82 | await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls', 'private')) | 82 | await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls', 'private')) |
diff --git a/server/tests/api/transcoding/transcoder.ts b/server/tests/api/transcoding/transcoder.ts index b899b736d..5386d236f 100644 --- a/server/tests/api/transcoding/transcoder.ts +++ b/server/tests/api/transcoding/transcoder.ts | |||
@@ -586,7 +586,7 @@ describe('Test video transcoding', function () { | |||
586 | '1440p': true, | 586 | '1440p': true, |
587 | '2160p': true | 587 | '2160p': true |
588 | }, | 588 | }, |
589 | web_videos: { enabled: true }, | 589 | webVideos: { enabled: true }, |
590 | hls: { enabled: true } | 590 | hls: { enabled: true } |
591 | } | 591 | } |
592 | } | 592 | } |
diff --git a/server/tests/cli/create-move-video-storage-job.ts b/server/tests/cli/create-move-video-storage-job.ts index 253fc983e..fc6a8e648 100644 --- a/server/tests/cli/create-move-video-storage-job.ts +++ b/server/tests/cli/create-move-video-storage-job.ts | |||
@@ -109,8 +109,8 @@ describe('Test create move video storage job', function () { | |||
109 | }) | 109 | }) |
110 | 110 | ||
111 | it('Should not have files on disk anymore', async function () { | 111 | it('Should not have files on disk anymore', async function () { |
112 | await checkDirectoryIsEmpty(servers[0], 'videos', [ 'private' ]) | 112 | await checkDirectoryIsEmpty(servers[0], 'web-videos', [ 'private' ]) |
113 | await checkDirectoryIsEmpty(servers[0], join('videos', 'private')) | 113 | await checkDirectoryIsEmpty(servers[0], join('web-videos', 'private')) |
114 | 114 | ||
115 | await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls'), [ 'private' ]) | 115 | await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls'), [ 'private' ]) |
116 | await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls', 'private')) | 116 | await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls', 'private')) |
diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts index b60e522a4..561ed6a68 100644 --- a/server/tests/cli/prune-storage.ts +++ b/server/tests/cli/prune-storage.ts | |||
@@ -35,10 +35,10 @@ async function assertNotExists (server: PeerTubeServer, directory: string, subst | |||
35 | 35 | ||
36 | async function assertCountAreOkay (servers: PeerTubeServer[]) { | 36 | async function assertCountAreOkay (servers: PeerTubeServer[]) { |
37 | for (const server of servers) { | 37 | for (const server of servers) { |
38 | const videosCount = await countFiles(server, 'videos') | 38 | const videosCount = await countFiles(server, 'web-videos') |
39 | expect(videosCount).to.equal(9) // 2 videos with 4 resolutions + private directory | 39 | expect(videosCount).to.equal(9) // 2 videos with 4 resolutions + private directory |
40 | 40 | ||
41 | const privateVideosCount = await countFiles(server, 'videos/private') | 41 | const privateVideosCount = await countFiles(server, 'web-videos/private') |
42 | expect(privateVideosCount).to.equal(4) | 42 | expect(privateVideosCount).to.equal(4) |
43 | 43 | ||
44 | const torrentsCount = await countFiles(server, 'torrents') | 44 | const torrentsCount = await countFiles(server, 'torrents') |
@@ -131,8 +131,8 @@ describe('Test prune storage scripts', function () { | |||
131 | it('Should create some dirty files', async function () { | 131 | it('Should create some dirty files', async function () { |
132 | for (let i = 0; i < 2; i++) { | 132 | for (let i = 0; i < 2; i++) { |
133 | { | 133 | { |
134 | const basePublic = servers[0].servers.buildDirectory('videos') | 134 | const basePublic = servers[0].servers.buildDirectory('web-videos') |
135 | const basePrivate = servers[0].servers.buildDirectory(join('videos', 'private')) | 135 | const basePrivate = servers[0].servers.buildDirectory(join('web-videos', 'private')) |
136 | 136 | ||
137 | const n1 = buildUUID() + '.mp4' | 137 | const n1 = buildUUID() + '.mp4' |
138 | const n2 = buildUUID() + '.webm' | 138 | const n2 = buildUUID() + '.webm' |