4 files changed, 1 insertions, 296 deletions

diff --git a/server/tests/cli/create-transcoding-job.ts b/server/tests/cli/create-transcoding-job.ts
deleted file mode 100644
index 38b737829..000000000
--- a/server/tests/cli/create-transcoding-job.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { areMockObjectStorageTestsDisabled } from '@shared/core-utils'
-import { HttpStatusCode, VideoFile } from '@shared/models'
-import {
-  cleanupTests,
-  createMultipleServers,
-  doubleFollow,
-  makeRawRequest,
-  ObjectStorageCommand,
-  PeerTubeServer,
-  setAccessTokensToServers,
-  waitJobs
-} from '@shared/server-commands'
-import { checkResolutionsInMasterPlaylist, expectStartWith } from '../shared'
-
-async function checkFilesInObjectStorage (files: VideoFile[], type: 'webtorrent' | 'playlist') {
-  for (const file of files) {
-    const shouldStartWith = type === 'webtorrent'
-      ? ObjectStorageCommand.getMockWebTorrentBaseUrl()
-      : ObjectStorageCommand.getMockPlaylistBaseUrl()
-
-    expectStartWith(file.fileUrl, shouldStartWith)
-
-    await makeRawRequest({ url: file.fileUrl, expectedStatus: HttpStatusCode.OK_200 })
-  }
-}
-
-function runTests (objectStorage: boolean) {
-  let servers: PeerTubeServer[] = []
-  const videosUUID: string[] = []
-  const publishedAt: string[] = []
-
-  before(async function () {
-    this.timeout(120000)
-
-    const config = objectStorage
-      ? ObjectStorageCommand.getDefaultMockConfig()
-      : {}
-
-    // Run server 2 to have transcoding enabled
-    servers = await createMultipleServers(2, config)
-    await setAccessTokensToServers(servers)
-
-    await servers[0].config.disableTranscoding()
-
-    await doubleFollow(servers[0], servers[1])
-
-    if (objectStorage) await ObjectStorageCommand.prepareDefaultMockBuckets()
-
-    for (let i = 1; i <= 5; i++) {
-      const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'video' + i } })
-
-      await waitJobs(servers)
-
-      const video = await servers[0].videos.get({ id: uuid })
-      publishedAt.push(video.publishedAt as string)
-
-      if (i > 2) {
-        videosUUID.push(uuid)
-      } else {
-        videosUUID.push(shortUUID)
-      }
-    }
-
-    await waitJobs(servers)
-  })
-
-  it('Should have two video files on each server', async function () {
-    this.timeout(30000)
-
-    for (const server of servers) {
-      const { data } = await server.videos.list()
-      expect(data).to.have.lengthOf(videosUUID.length)
-
-      for (const video of data) {
-        const videoDetail = await server.videos.get({ id: video.uuid })
-        expect(videoDetail.files).to.have.lengthOf(1)
-        expect(videoDetail.streamingPlaylists).to.have.lengthOf(0)
-      }
-    }
-  })
-
-  it('Should run a transcoding job on video 2', async function () {
-    this.timeout(60000)
-
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[1]}`)
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const { data } = await server.videos.list()
-
-      let infoHashes: { [id: number]: string }
-
-      for (const video of data) {
-        const videoDetails = await server.videos.get({ id: video.uuid })
-
-        if (video.shortUUID === videosUUID[1] || video.uuid === videosUUID[1]) {
-          expect(videoDetails.files).to.have.lengthOf(4)
-          expect(videoDetails.streamingPlaylists).to.have.lengthOf(0)
-
-          if (objectStorage) await checkFilesInObjectStorage(videoDetails.files, 'webtorrent')
-
-          if (!infoHashes) {
-            infoHashes = {}
-
-            for (const file of videoDetails.files) {
-              infoHashes[file.resolution.id.toString()] = file.magnetUri
-            }
-          } else {
-            for (const resolution of Object.keys(infoHashes)) {
-              const file = videoDetails.files.find(f => f.resolution.id.toString() === resolution)
-              expect(file.magnetUri).to.equal(infoHashes[resolution])
-            }
-          }
-        } else {
-          expect(videoDetails.files).to.have.lengthOf(1)
-          expect(videoDetails.streamingPlaylists).to.have.lengthOf(0)
-        }
-      }
-    }
-  })
-
-  it('Should run a transcoding job on video 1 with resolution', async function () {
-    this.timeout(60000)
-
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[0]} -r 480`)
-
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const { data } = await server.videos.list()
-      expect(data).to.have.lengthOf(videosUUID.length)
-
-      const videoDetails = await server.videos.get({ id: videosUUID[0] })
-
-      expect(videoDetails.files).to.have.lengthOf(2)
-      expect(videoDetails.files[0].resolution.id).to.equal(720)
-      expect(videoDetails.files[1].resolution.id).to.equal(480)
-
-      expect(videoDetails.streamingPlaylists).to.have.lengthOf(0)
-
-      if (objectStorage) await checkFilesInObjectStorage(videoDetails.files, 'webtorrent')
-    }
-  })
-
-  it('Should generate an HLS resolution', async function () {
-    this.timeout(120000)
-
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[2]} --generate-hls -r 480`)
-
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const videoDetails = await server.videos.get({ id: videosUUID[2] })
-
-      expect(videoDetails.files).to.have.lengthOf(1)
-      if (objectStorage) await checkFilesInObjectStorage(videoDetails.files, 'webtorrent')
-
-      expect(videoDetails.streamingPlaylists).to.have.lengthOf(1)
-
-      const hlsPlaylist = videoDetails.streamingPlaylists[0]
-
-      const files = hlsPlaylist.files
-      expect(files).to.have.lengthOf(1)
-      expect(files[0].resolution.id).to.equal(480)
-
-      if (objectStorage) {
-        await checkFilesInObjectStorage(files, 'playlist')
-
-        const resolutions = files.map(f => f.resolution.id)
-        await checkResolutionsInMasterPlaylist({ server, playlistUrl: hlsPlaylist.playlistUrl, resolutions })
-      }
-    }
-  })
-
-  it('Should not duplicate an HLS resolution', async function () {
-    this.timeout(120000)
-
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[2]} --generate-hls -r 480`)
-
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const videoDetails = await server.videos.get({ id: videosUUID[2] })
-
-      const files = videoDetails.streamingPlaylists[0].files
-      expect(files).to.have.lengthOf(1)
-      expect(files[0].resolution.id).to.equal(480)
-
-      if (objectStorage) await checkFilesInObjectStorage(files, 'playlist')
-    }
-  })
-
-  it('Should generate all HLS resolutions', async function () {
-    this.timeout(120000)
-
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[3]} --generate-hls`)
-
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const videoDetails = await server.videos.get({ id: videosUUID[3] })
-
-      expect(videoDetails.files).to.have.lengthOf(1)
-      expect(videoDetails.streamingPlaylists).to.have.lengthOf(1)
-
-      const files = videoDetails.streamingPlaylists[0].files
-      expect(files).to.have.lengthOf(4)
-
-      if (objectStorage) await checkFilesInObjectStorage(files, 'playlist')
-    }
-  })
-
-  it('Should optimize the video file and generate HLS videos if enabled in config', async function () {
-    this.timeout(120000)
-
-    await servers[0].config.enableTranscoding()
-    await servers[0].cli.execWithEnv(`npm run create-transcoding-job -- -v ${videosUUID[4]}`)
-
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const videoDetails = await server.videos.get({ id: videosUUID[4] })
-
-      expect(videoDetails.files).to.have.lengthOf(5)
-      expect(videoDetails.streamingPlaylists).to.have.lengthOf(1)
-      expect(videoDetails.streamingPlaylists[0].files).to.have.lengthOf(5)
-
-      if (objectStorage) {
-        await checkFilesInObjectStorage(videoDetails.files, 'webtorrent')
-        await checkFilesInObjectStorage(videoDetails.streamingPlaylists[0].files, 'playlist')
-      }
-    }
-  })
-
-  it('Should not have updated published at attributes', async function () {
-    for (const id of videosUUID) {
-      const video = await servers[0].videos.get({ id })
-
-      expect(publishedAt.some(p => video.publishedAt === p)).to.be.true
-    }
-  })
-
-  after(async function () {
-    await cleanupTests(servers)
-  })
-}
-
-describe('Test create transcoding jobs', function () {
-
-  describe('On filesystem', function () {
-    runTests(false)
-  })
-
-  describe('On object storage', function () {
-    if (areMockObjectStorageTestsDisabled()) return
-
-    runTests(true)
-  })
-})
diff --git a/server/tests/cli/index.ts b/server/tests/cli/index.ts
index 6e0cbe58b..8579be39c 100644
--- a/server/tests/cli/index.ts
+++ b/server/tests/cli/index.ts
@@ -1,10 +1,8 @@
 // Order of the tests we want to execute
 import './create-import-video-file-job'
-import './create-transcoding-job'
 import './create-move-video-storage-job'
 import './peertube'
 import './plugins'
-import './print-transcode-command'
 import './prune-storage'
 import './regenerate-thumbnails'
 import './reset-password'
diff --git a/server/tests/cli/print-transcode-command.ts b/server/tests/cli/print-transcode-command.ts
deleted file mode 100644
index 33b6cd27c..000000000
--- a/server/tests/cli/print-transcode-command.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { buildAbsoluteFixturePath } from '@shared/core-utils'
-import { CLICommand } from '@shared/server-commands'
-import { VideoResolution } from '../../../shared/models/videos'
-
-describe('Test print transcode jobs', function () {
-
-  it('Should print the correct command for each resolution', async function () {
-    const fixturePath = buildAbsoluteFixturePath('video_short.webm')
-
-    for (const resolution of [
-      VideoResolution.H_720P,
-      VideoResolution.H_1080P
-    ]) {
-      const command = await CLICommand.exec(`npm run print-transcode-command -- ${fixturePath} -r ${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:v `)
-      expect(command).to.includes(`-bufsize:v `)
-    }
-  })
-})
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 51257d3d3..386c384e6 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -7,11 +7,11 @@ import {
   createSingleServer,
   killallServers,
   makeActivityPubGetRequest,
-  parseTorrentVideo,
   PeerTubeServer,
   setAccessTokensToServers,
   waitJobs
 } from '@shared/server-commands'
+import { parseTorrentVideo } from '../shared'
 
 describe('Test update host scripts', function () {
   let server: PeerTubeServer