aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-12-06 09:55:36 +0100
committerChocobozzz <me@florianbigard.com>2019-12-06 10:05:49 +0100
commit941c5eac1751ef93500d6afa58c4575f777dbff9 (patch)
tree765c99a830ff56f426d00e6155b1dad21e91269e /server/tests
parent0912f1b4caaa7394516567044f896132ad991131 (diff)
downloadPeerTube-941c5eac1751ef93500d6afa58c4575f777dbff9.tar.gz
PeerTube-941c5eac1751ef93500d6afa58c4575f777dbff9.tar.zst
PeerTube-941c5eac1751ef93500d6afa58c4575f777dbff9.zip
Add missing hotkeys to the watch page
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/videos/video-transcoder.ts4
-rw-r--r--server/tests/cli/optimize-old-videos.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 90ade1652..4be74901a 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -292,7 +292,7 @@ describe('Test video transcoding', function () {
292 tempFixturePath = await generateHighBitrateVideo() 292 tempFixturePath = await generateHighBitrateVideo()
293 293
294 const bitrate = await getVideoFileBitrate(tempFixturePath) 294 const bitrate = await getVideoFileBitrate(tempFixturePath)
295 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 60, VIDEO_TRANSCODING_FPS)) 295 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 25, VIDEO_TRANSCODING_FPS))
296 } 296 }
297 297
298 const videoAttributes = { 298 const videoAttributes = {
@@ -331,7 +331,7 @@ describe('Test video transcoding', function () {
331 tempFixturePath = await generateHighBitrateVideo() 331 tempFixturePath = await generateHighBitrateVideo()
332 332
333 const bitrate = await getVideoFileBitrate(tempFixturePath) 333 const bitrate = await getVideoFileBitrate(tempFixturePath)
334 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 60, VIDEO_TRANSCODING_FPS)) 334 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 25, VIDEO_TRANSCODING_FPS))
335 } 335 }
336 336
337 for (const fixture of [ 'video_short.mkv', 'video_short.avi' ]) { 337 for (const fixture of [ 'video_short.mkv', 'video_short.avi' ]) {
diff --git a/server/tests/cli/optimize-old-videos.ts b/server/tests/cli/optimize-old-videos.ts
index fa82f962c..de5d672f5 100644
--- a/server/tests/cli/optimize-old-videos.ts
+++ b/server/tests/cli/optimize-old-videos.ts
@@ -46,7 +46,7 @@ describe('Test optimize old videos', function () {
46 tempFixturePath = await generateHighBitrateVideo() 46 tempFixturePath = await generateHighBitrateVideo()
47 47
48 const bitrate = await getVideoFileBitrate(tempFixturePath) 48 const bitrate = await getVideoFileBitrate(tempFixturePath)
49 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 60, VIDEO_TRANSCODING_FPS)) 49 expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 25, VIDEO_TRANSCODING_FPS))
50 } 50 }
51 51
52 // Upload two videos for our needs 52 // Upload two videos for our needs
@@ -102,7 +102,7 @@ describe('Test optimize old videos', function () {
102 expect(videosDetails.files).to.have.lengthOf(1) 102 expect(videosDetails.files).to.have.lengthOf(1)
103 const file = videosDetails.files[0] 103 const file = videosDetails.files[0]
104 104
105 expect(file.size).to.be.below(5000000) 105 expect(file.size).to.be.below(8000000)
106 106
107 const path = join(root(), 'test' + servers[0].internalServerNumber, 'videos', video.uuid + '-' + file.resolution.id + '.mp4') 107 const path = join(root(), 'test' + servers[0].internalServerNumber, 'videos', video.uuid + '-' + file.resolution.id + '.mp4')
108 const bitrate = await getVideoFileBitrate(path) 108 const bitrate = await getVideoFileBitrate(path)