X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fprint-transcode-command.ts;h=27896f0310f804ca482dc53a9e1530268800cc7b;hb=c55e3d7227fe1453869e309025996b9d75256d5d;hp=4a7988d4deaa4ecf823b485269fdbe784ad39753;hpb=7185dab3ff509cec9f03a15d826625b5a1bd0ada;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/print-transcode-command.ts b/server/tests/cli/print-transcode-command.ts
index 4a7988d4d..27896f031 100644
--- a/server/tests/cli/print-transcode-command.ts
+++ b/server/tests/cli/print-transcode-command.ts
@@ -2,35 +2,33 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { execCLI } from '../../../shared/extra-utils'
-import { getTargetBitrate, VideoResolution } from '../../../shared/models/videos'
-import { VIDEO_TRANSCODING_FPS } from '../../initializers/constants'
-import { getVideoFileBitrate, getVideoFileFPS } from '@server/helpers/ffprobe-utils'
+import { buildAbsoluteFixturePath } from '@shared/core-utils'
+import { CLICommand } from '@shared/server-commands'
+import { VideoResolution } from '../../../shared/models/videos'
 
 const expect = chai.expect
 
-describe('Test create transcoding jobs', function () {
+describe('Test print transcode jobs', function () {
+
   it('Should print the correct command for each resolution', async function () {
-    const fixturePath = 'server/tests/fixtures/video_short.webm'
-    const fps = await getVideoFileFPS(fixturePath)
-    const bitrate = await getVideoFileBitrate(fixturePath)
+    const fixturePath = buildAbsoluteFixturePath('video_short.webm')
 
     for (const resolution of [
       VideoResolution.H_720P,
       VideoResolution.H_1080P
     ]) {
-      const command = await execCLI(`npm run print-transcode-command -- ${fixturePath} -r ${resolution}`)
-      const targetBitrate = Math.min(getTargetBitrate(resolution, fps, VIDEO_TRANSCODING_FPS), bitrate)
+      const command = await CLICommand.exec(`npm run print-transcode-command -- ${fixturePath} -r ${resolution}`)
 
-      expect(command).to.includes(`-y -acodec aac -vcodec libx264 -filter:v scale=w=trunc(oh*a/2)*2:h=${resolution}`)
+      expect(command).to.includes(`-vf scale=w=-2:h=${resolution}`)
+      expect(command).to.includes(`-y -acodec aac -vcodec libx264`)
       expect(command).to.includes('-f mp4')
       expect(command).to.includes('-movflags faststart')
       expect(command).to.includes('-b:a 256k')
       expect(command).to.includes('-r 25')
       expect(command).to.includes('-level:v 3.1')
       expect(command).to.includes('-g:v 50')
-      expect(command).to.includes(`-maxrate ${targetBitrate}`)
-      expect(command).to.includes(`-bufsize ${targetBitrate * 2}`)
+      expect(command).to.includes(`-maxrate `)
+      expect(command).to.includes(`-bufsize `)
     }
   })
 })