4 files changed, 436 insertions, 303 deletions

diff --git a/server/tests/api/server/proxy.ts b/server/tests/api/server/proxy.ts
index 72bd49078..29f3e10d8 100644
--- a/server/tests/api/server/proxy.ts
+++ b/server/tests/api/server/proxy.ts
@@ -2,8 +2,18 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import {
+  cleanupTests,
+  createMultipleServers,
+  doubleFollow,
+  FIXTURE_URLS,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  waitJobs
+} from '@shared/extra-utils'
 import { MockProxy } from '@shared/extra-utils/mock-servers/mock-proxy'
+import { HttpStatusCode, VideoPrivacy } from '@shared/models'
 
 const expect = chai.expect
 
@@ -25,43 +35,90 @@ describe('Test proxy', function () {
     goodEnv.HTTP_PROXY = 'http://localhost:' + proxyPort
 
     await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
     await doubleFollow(servers[0], servers[1])
   })
 
-  it('Should succeed federation with the appropriate proxy config', async function () {
-    await servers[0].kill()
-    await servers[0].run({}, { env: goodEnv })
+  describe('Federation', function () {
 
-    await servers[0].videos.quickUpload({ name: 'video 1' })
+    it('Should succeed federation with the appropriate proxy config', async function () {
+      this.timeout(40000)
 
-    await waitJobs(servers)
+      await servers[0].kill()
+      await servers[0].run({}, { env: goodEnv })
 
-    for (const server of servers) {
-      const { total, data } = await server.videos.list()
-      expect(total).to.equal(1)
-      expect(data).to.have.lengthOf(1)
-    }
+      await servers[0].videos.quickUpload({ name: 'video 1' })
+
+      await waitJobs(servers)
+
+      for (const server of servers) {
+        const { total, data } = await server.videos.list()
+        expect(total).to.equal(1)
+        expect(data).to.have.lengthOf(1)
+      }
+    })
+
+    it('Should fail federation with a wrong proxy config', async function () {
+      this.timeout(40000)
+
+      await servers[0].kill()
+      await servers[0].run({}, { env: badEnv })
+
+      await servers[0].videos.quickUpload({ name: 'video 2' })
+
+      await waitJobs(servers)
+
+      {
+        const { total, data } = await servers[0].videos.list()
+        expect(total).to.equal(2)
+        expect(data).to.have.lengthOf(2)
+      }
+
+      {
+        const { total, data } = await servers[1].videos.list()
+        expect(total).to.equal(1)
+        expect(data).to.have.lengthOf(1)
+      }
+    })
   })
 
-  it('Should fail federation with a wrong proxy config', async function () {
-    await servers[0].kill()
-    await servers[0].run({}, { env: badEnv })
+  describe('Videos import', async function () {
+
+    function quickImport (expectedStatus: HttpStatusCode = HttpStatusCode.OK_200) {
+      return servers[0].imports.importVideo({
+        attributes: {
+          name: 'video import',
+          channelId: servers[0].store.channel.id,
+          privacy: VideoPrivacy.PUBLIC,
+          targetUrl: FIXTURE_URLS.peertube_long
+        },
+        expectedStatus
+      })
+    }
+
+    it('Should succeed import with the appropriate proxy config', async function () {
+      this.timeout(40000)
+
+      await servers[0].kill()
+      await servers[0].run({}, { env: goodEnv })
 
-    await servers[0].videos.quickUpload({ name: 'video 2' })
+      await quickImport()
 
-    await waitJobs(servers)
+      await waitJobs(servers)
 
-    {
       const { total, data } = await servers[0].videos.list()
-      expect(total).to.equal(2)
-      expect(data).to.have.lengthOf(2)
-    }
+      expect(total).to.equal(3)
+      expect(data).to.have.lengthOf(3)
+    })
 
-    {
-      const { total, data } = await servers[1].videos.list()
-      expect(total).to.equal(1)
-      expect(data).to.have.lengthOf(1)
-    }
+    it('Should fail import with a wrong proxy config', async function () {
+      this.timeout(40000)
+
+      await servers[0].kill()
+      await servers[0].run({}, { env: badEnv })
+
+      await quickImport(HttpStatusCode.BAD_REQUEST_400)
+    })
   })
 
   after(async function () {
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index 948c779e8..cfb188060 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -1,368 +1,444 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-import * as chai from 'chai'
+import { expect } from 'chai'
+import { pathExists, remove } from 'fs-extra'
+import { join } from 'path'
 import {
   areHttpImportTestsDisabled,
   cleanupTests,
   createMultipleServers,
+  createSingleServer,
   doubleFollow,
   FIXTURE_URLS,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultVideoChannel,
   testCaptionFile,
   testImage,
   waitJobs
 } from '@shared/extra-utils'
 import { VideoPrivacy, VideoResolution } from '@shared/models'
 
-const expect = chai.expect
+async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMagnet: string, idTorrent: string) {
+  const videoHttp = await server.videos.get({ id: idHttp })
+
+  expect(videoHttp.name).to.equal('small video - youtube')
+  // FIXME: youtube-dl seems broken
+  // expect(videoHttp.category.label).to.equal('News & Politics')
+  // expect(videoHttp.licence.label).to.equal('Attribution')
+  expect(videoHttp.language.label).to.equal('Unknown')
+  expect(videoHttp.nsfw).to.be.false
+  expect(videoHttp.description).to.equal('this is a super description')
+  expect(videoHttp.tags).to.deep.equal([ 'tag1', 'tag2' ])
+  expect(videoHttp.files).to.have.lengthOf(1)
+
+  const originallyPublishedAt = new Date(videoHttp.originallyPublishedAt)
+  expect(originallyPublishedAt.getDate()).to.equal(14)
+  expect(originallyPublishedAt.getMonth()).to.equal(0)
+  expect(originallyPublishedAt.getFullYear()).to.equal(2019)
+
+  const videoMagnet = await server.videos.get({ id: idMagnet })
+  const videoTorrent = await server.videos.get({ id: idTorrent })
+
+  for (const video of [ videoMagnet, videoTorrent ]) {
+    expect(video.category.label).to.equal('Misc')
+    expect(video.licence.label).to.equal('Unknown')
+    expect(video.language.label).to.equal('Unknown')
+    expect(video.nsfw).to.be.false
+    expect(video.description).to.equal('this is a super torrent description')
+    expect(video.tags).to.deep.equal([ 'tag_torrent1', 'tag_torrent2' ])
+    expect(video.files).to.have.lengthOf(1)
+  }
+
+  expect(videoTorrent.name).to.contain('你好 世界 720p.mp4')
+  expect(videoMagnet.name).to.contain('super peertube2 video')
+
+  const bodyCaptions = await server.captions.list({ videoId: idHttp })
+  expect(bodyCaptions.total).to.equal(2)
+}
+
+async function checkVideoServer2 (server: PeerTubeServer, id: number | string) {
+  const video = await server.videos.get({ id })
+
+  expect(video.name).to.equal('my super name')
+  expect(video.category.label).to.equal('Entertainment')
+  expect(video.licence.label).to.equal('Public Domain Dedication')
+  expect(video.language.label).to.equal('English')
+  expect(video.nsfw).to.be.false
+  expect(video.description).to.equal('my super description')
+  expect(video.tags).to.deep.equal([ 'supertag1', 'supertag2' ])
+
+  expect(video.files).to.have.lengthOf(1)
+
+  const bodyCaptions = await server.captions.list({ videoId: id })
+  expect(bodyCaptions.total).to.equal(2)
+}
 
 describe('Test video imports', function () {
-  let servers: PeerTubeServer[] = []
-  let channelIdServer1: number
-  let channelIdServer2: number
 
   if (areHttpImportTestsDisabled()) return
 
-  async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMagnet: string, idTorrent: string) {
-    const videoHttp = await server.videos.get({ id: idHttp })
-
-    expect(videoHttp.name).to.equal('small video - youtube')
-    // FIXME: youtube-dl seems broken
-    // expect(videoHttp.category.label).to.equal('News & Politics')
-    // expect(videoHttp.licence.label).to.equal('Attribution')
-    expect(videoHttp.language.label).to.equal('Unknown')
-    expect(videoHttp.nsfw).to.be.false
-    expect(videoHttp.description).to.equal('this is a super description')
-    expect(videoHttp.tags).to.deep.equal([ 'tag1', 'tag2' ])
-    expect(videoHttp.files).to.have.lengthOf(1)
-
-    const originallyPublishedAt = new Date(videoHttp.originallyPublishedAt)
-    expect(originallyPublishedAt.getDate()).to.equal(14)
-    expect(originallyPublishedAt.getMonth()).to.equal(0)
-    expect(originallyPublishedAt.getFullYear()).to.equal(2019)
-
-    const videoMagnet = await server.videos.get({ id: idMagnet })
-    const videoTorrent = await server.videos.get({ id: idTorrent })
-
-    for (const video of [ videoMagnet, videoTorrent ]) {
-      expect(video.category.label).to.equal('Misc')
-      expect(video.licence.label).to.equal('Unknown')
-      expect(video.language.label).to.equal('Unknown')
-      expect(video.nsfw).to.be.false
-      expect(video.description).to.equal('this is a super torrent description')
-      expect(video.tags).to.deep.equal([ 'tag_torrent1', 'tag_torrent2' ])
-      expect(video.files).to.have.lengthOf(1)
-    }
+  function runSuite (mode: 'youtube-dl' | 'yt-dlp') {
 
-    expect(videoTorrent.name).to.contain('你好 世界 720p.mp4')
-    expect(videoMagnet.name).to.contain('super peertube2 video')
+    describe('Import ' + mode, function () {
+      let servers: PeerTubeServer[] = []
 
-    const bodyCaptions = await server.captions.list({ videoId: idHttp })
-    expect(bodyCaptions.total).to.equal(2)
-  }
+      before(async function () {
+        this.timeout(30_000)
 
-  async function checkVideoServer2 (server: PeerTubeServer, id: number | string) {
-    const video = await server.videos.get({ id })
+        // Run servers
+        servers = await createMultipleServers(2, {
+          import: {
+            videos: {
+              http: {
+                youtube_dl_release: {
+                  url: mode === 'youtube-dl'
+                    ? 'https://yt-dl.org/downloads/latest/youtube-dl'
+                    : 'https://api.github.com/repos/yt-dlp/yt-dlp/releases',
 
-    expect(video.name).to.equal('my super name')
-    expect(video.category.label).to.equal('Entertainment')
-    expect(video.licence.label).to.equal('Public Domain Dedication')
-    expect(video.language.label).to.equal('English')
-    expect(video.nsfw).to.be.false
-    expect(video.description).to.equal('my super description')
-    expect(video.tags).to.deep.equal([ 'supertag1', 'supertag2' ])
+                  name: mode
+                }
+              }
+            }
+          }
+        })
 
-    expect(video.files).to.have.lengthOf(1)
+        await setAccessTokensToServers(servers)
+        await setDefaultVideoChannel(servers)
 
-    const bodyCaptions = await server.captions.list({ videoId: id })
-    expect(bodyCaptions.total).to.equal(2)
-  }
+        await doubleFollow(servers[0], servers[1])
+      })
 
-  before(async function () {
-    this.timeout(30_000)
+      it('Should import videos on server 1', async function () {
+        this.timeout(60_000)
 
-    // Run servers
-    servers = await createMultipleServers(2)
+        const baseAttributes = {
+          channelId: servers[0].store.channel.id,
+          privacy: VideoPrivacy.PUBLIC
+        }
 
-    await setAccessTokensToServers(servers)
+        {
+          const attributes = { ...baseAttributes, targetUrl: FIXTURE_URLS.youtube }
+          const { video } = await servers[0].imports.importVideo({ attributes })
+          expect(video.name).to.equal('small video - youtube')
 
-    {
-      const { videoChannels } = await servers[0].users.getMyInfo()
-      channelIdServer1 = videoChannels[0].id
-    }
+          {
+            expect(video.thumbnailPath).to.match(new RegExp(`^/static/thumbnails/.+.jpg$`))
+            expect(video.previewPath).to.match(new RegExp(`^/lazy-static/previews/.+.jpg$`))
 
-    {
-      const { videoChannels } = await servers[1].users.getMyInfo()
-      channelIdServer2 = videoChannels[0].id
-    }
+            const suffix = mode === 'yt-dlp'
+              ? '_yt_dlp'
+              : ''
 
-    await doubleFollow(servers[0], servers[1])
-  })
+            await testImage(servers[0].url, 'video_import_thumbnail' + suffix, video.thumbnailPath)
+            await testImage(servers[0].url, 'video_import_preview' + suffix, video.previewPath)
+          }
 
-  it('Should import videos on server 1', async function () {
-    this.timeout(60_000)
+          const bodyCaptions = await servers[0].captions.list({ videoId: video.id })
+          const videoCaptions = bodyCaptions.data
+          expect(videoCaptions).to.have.lengthOf(2)
 
-    const baseAttributes = {
-      channelId: channelIdServer1,
-      privacy: VideoPrivacy.PUBLIC
-    }
+          {
+            const enCaption = videoCaptions.find(caption => caption.language.id === 'en')
+            expect(enCaption).to.exist
+            expect(enCaption.language.label).to.equal('English')
+            expect(enCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-en.vtt$`))
 
-    {
-      const attributes = { ...baseAttributes, targetUrl: FIXTURE_URLS.youtube }
-      const { video } = await servers[0].imports.importVideo({ attributes })
-      expect(video.name).to.equal('small video - youtube')
+            const regex = `WEBVTT[ \n]+Kind: captions[ \n]+Language: en[ \n]+00:00:01.600 --> 00:00:04.200[ \n]+English \\(US\\)[ \n]+` +
+              `00:00:05.900 --> 00:00:07.999[ \n]+This is a subtitle in American English[ \n]+` +
+              `00:00:10.000 --> 00:00:14.000[ \n]+Adding subtitles is very easy to do`
+            await testCaptionFile(servers[0].url, enCaption.captionPath, new RegExp(regex))
+          }
 
-      expect(video.thumbnailPath).to.match(new RegExp(`^/static/thumbnails/.+.jpg$`))
-      expect(video.previewPath).to.match(new RegExp(`^/lazy-static/previews/.+.jpg$`))
+          {
+            const frCaption = videoCaptions.find(caption => caption.language.id === 'fr')
+            expect(frCaption).to.exist
+            expect(frCaption.language.label).to.equal('French')
+            expect(frCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-fr.vtt`))
 
-      await testImage(servers[0].url, 'video_import_thumbnail', video.thumbnailPath)
-      await testImage(servers[0].url, 'video_import_preview', video.previewPath)
+            const regex = `WEBVTT[ \n]+Kind: captions[ \n]+Language: fr[ \n]+00:00:01.600 --> 00:00:04.200[ \n]+` +
+              `Français \\(FR\\)[ \n]+00:00:05.900 --> 00:00:07.999[ \n]+C'est un sous-titre français[ \n]+` +
+              `00:00:10.000 --> 00:00:14.000[ \n]+Ajouter un sous-titre est vraiment facile`
 
-      const bodyCaptions = await servers[0].captions.list({ videoId: video.id })
-      const videoCaptions = bodyCaptions.data
-      expect(videoCaptions).to.have.lengthOf(2)
+            await testCaptionFile(servers[0].url, frCaption.captionPath, new RegExp(regex))
+          }
+        }
 
-      const enCaption = videoCaptions.find(caption => caption.language.id === 'en')
-      expect(enCaption).to.exist
-      expect(enCaption.language.label).to.equal('English')
-      expect(enCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-en.vtt$`))
-      await testCaptionFile(servers[0].url, enCaption.captionPath, `WEBVTT
-Kind: captions
-Language: en
+        {
+          const attributes = {
+            ...baseAttributes,
+            magnetUri: FIXTURE_URLS.magnet,
+            description: 'this is a super torrent description',
+            tags: [ 'tag_torrent1', 'tag_torrent2' ]
+          }
+          const { video } = await servers[0].imports.importVideo({ attributes })
+          expect(video.name).to.equal('super peertube2 video')
+        }
 
-00:00:01.600 --> 00:00:04.200
-English (US)
+        {
+          const attributes = {
+            ...baseAttributes,
+            torrentfile: 'video-720p.torrent' as any,
+            description: 'this is a super torrent description',
+            tags: [ 'tag_torrent1', 'tag_torrent2' ]
+          }
+          const { video } = await servers[0].imports.importVideo({ attributes })
+          expect(video.name).to.equal('你好 世界 720p.mp4')
+        }
+      })
 
-00:00:05.900 --> 00:00:07.999
-This is a subtitle in American English
+      it('Should list the videos to import in my videos on server 1', async function () {
+        const { total, data } = await servers[0].videos.listMyVideos({ sort: 'createdAt' })
 
-00:00:10.000 --> 00:00:14.000
-Adding subtitles is very easy to do`)
+        expect(total).to.equal(3)
 
-      const frCaption = videoCaptions.find(caption => caption.language.id === 'fr')
-      expect(frCaption).to.exist
-      expect(frCaption.language.label).to.equal('French')
-      expect(frCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-fr.vtt`))
-      await testCaptionFile(servers[0].url, frCaption.captionPath, `WEBVTT
-Kind: captions
-Language: fr
+        expect(data).to.have.lengthOf(3)
+        expect(data[0].name).to.equal('small video - youtube')
+        expect(data[1].name).to.equal('super peertube2 video')
+        expect(data[2].name).to.equal('你好 世界 720p.mp4')
+      })
 
-00:00:01.600 --> 00:00:04.200
-Français (FR)
+      it('Should list the videos to import in my imports on server 1', async function () {
+        const { total, data: videoImports } = await servers[0].imports.getMyVideoImports({ sort: '-createdAt' })
+        expect(total).to.equal(3)
 
-00:00:05.900 --> 00:00:07.999
-C'est un sous-titre français
+        expect(videoImports).to.have.lengthOf(3)
 
-00:00:10.000 --> 00:00:14.000
-Ajouter un sous-titre est vraiment facile`)
-    }
+        expect(videoImports[2].targetUrl).to.equal(FIXTURE_URLS.youtube)
+        expect(videoImports[2].magnetUri).to.be.null
+        expect(videoImports[2].torrentName).to.be.null
+        expect(videoImports[2].video.name).to.equal('small video - youtube')
 
-    {
-      const attributes = {
-        ...baseAttributes,
-        magnetUri: FIXTURE_URLS.magnet,
-        description: 'this is a super torrent description',
-        tags: [ 'tag_torrent1', 'tag_torrent2' ]
-      }
-      const { video } = await servers[0].imports.importVideo({ attributes })
-      expect(video.name).to.equal('super peertube2 video')
-    }
+        expect(videoImports[1].targetUrl).to.be.null
+        expect(videoImports[1].magnetUri).to.equal(FIXTURE_URLS.magnet)
+        expect(videoImports[1].torrentName).to.be.null
+        expect(videoImports[1].video.name).to.equal('super peertube2 video')
 
-    {
-      const attributes = {
-        ...baseAttributes,
-        torrentfile: 'video-720p.torrent' as any,
-        description: 'this is a super torrent description',
-        tags: [ 'tag_torrent1', 'tag_torrent2' ]
-      }
-      const { video } = await servers[0].imports.importVideo({ attributes })
-      expect(video.name).to.equal('你好 世界 720p.mp4')
-    }
-  })
+        expect(videoImports[0].targetUrl).to.be.null
+        expect(videoImports[0].magnetUri).to.be.null
+        expect(videoImports[0].torrentName).to.equal('video-720p.torrent')
+        expect(videoImports[0].video.name).to.equal('你好 世界 720p.mp4')
+      })
 
-  it('Should list the videos to import in my videos on server 1', async function () {
-    const { total, data } = await servers[0].videos.listMyVideos({ sort: 'createdAt' })
+      it('Should have the video listed on the two instances', async function () {
+        this.timeout(120_000)
 
-    expect(total).to.equal(3)
+        await waitJobs(servers)
 
-    expect(data).to.have.lengthOf(3)
-    expect(data[0].name).to.equal('small video - youtube')
-    expect(data[1].name).to.equal('super peertube2 video')
-    expect(data[2].name).to.equal('你好 世界 720p.mp4')
-  })
+        for (const server of servers) {
+          const { total, data } = await server.videos.list()
+          expect(total).to.equal(3)
+          expect(data).to.have.lengthOf(3)
 
-  it('Should list the videos to import in my imports on server 1', async function () {
-    const { total, data: videoImports } = await servers[0].imports.getMyVideoImports({ sort: '-createdAt' })
-    expect(total).to.equal(3)
+          const [ videoHttp, videoMagnet, videoTorrent ] = data
+          await checkVideosServer1(server, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
+        }
+      })
+
+      it('Should import a video on server 2 with some fields', async function () {
+        this.timeout(60_000)
+
+        const attributes = {
+          targetUrl: FIXTURE_URLS.youtube,
+          channelId: servers[1].store.channel.id,
+          privacy: VideoPrivacy.PUBLIC,
+          category: 10,
+          licence: 7,
+          language: 'en',
+          name: 'my super name',
+          description: 'my super description',
+          tags: [ 'supertag1', 'supertag2' ]
+        }
+        const { video } = await servers[1].imports.importVideo({ attributes })
+        expect(video.name).to.equal('my super name')
+      })
 
-    expect(videoImports).to.have.lengthOf(3)
+      it('Should have the videos listed on the two instances', async function () {
+        this.timeout(120_000)
 
-    expect(videoImports[2].targetUrl).to.equal(FIXTURE_URLS.youtube)
-    expect(videoImports[2].magnetUri).to.be.null
-    expect(videoImports[2].torrentName).to.be.null
-    expect(videoImports[2].video.name).to.equal('small video - youtube')
+        await waitJobs(servers)
 
-    expect(videoImports[1].targetUrl).to.be.null
-    expect(videoImports[1].magnetUri).to.equal(FIXTURE_URLS.magnet)
-    expect(videoImports[1].torrentName).to.be.null
-    expect(videoImports[1].video.name).to.equal('super peertube2 video')
+        for (const server of servers) {
+          const { total, data } = await server.videos.list()
+          expect(total).to.equal(4)
+          expect(data).to.have.lengthOf(4)
 
-    expect(videoImports[0].targetUrl).to.be.null
-    expect(videoImports[0].magnetUri).to.be.null
-    expect(videoImports[0].torrentName).to.equal('video-720p.torrent')
-    expect(videoImports[0].video.name).to.equal('你好 世界 720p.mp4')
-  })
+          await checkVideoServer2(server, data[0].uuid)
 
-  it('Should have the video listed on the two instances', async function () {
-    this.timeout(120_000)
+          const [ , videoHttp, videoMagnet, videoTorrent ] = data
+          await checkVideosServer1(server, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
+        }
+      })
 
-    await waitJobs(servers)
+      it('Should import a video that will be transcoded', async function () {
+        this.timeout(240_000)
 
-    for (const server of servers) {
-      const { total, data } = await server.videos.list()
-      expect(total).to.equal(3)
-      expect(data).to.have.lengthOf(3)
+        const attributes = {
+          name: 'transcoded video',
+          magnetUri: FIXTURE_URLS.magnet,
+          channelId: servers[1].store.channel.id,
+          privacy: VideoPrivacy.PUBLIC
+        }
+        const { video } = await servers[1].imports.importVideo({ attributes })
+        const videoUUID = video.uuid
 
-      const [ videoHttp, videoMagnet, videoTorrent ] = data
-      await checkVideosServer1(server, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
-    }
-  })
+        await waitJobs(servers)
 
-  it('Should import a video on server 2 with some fields', async function () {
-    this.timeout(60_000)
-
-    const attributes = {
-      targetUrl: FIXTURE_URLS.youtube,
-      channelId: channelIdServer2,
-      privacy: VideoPrivacy.PUBLIC,
-      category: 10,
-      licence: 7,
-      language: 'en',
-      name: 'my super name',
-      description: 'my super description',
-      tags: [ 'supertag1', 'supertag2' ]
-    }
-    const { video } = await servers[1].imports.importVideo({ attributes })
-    expect(video.name).to.equal('my super name')
-  })
+        for (const server of servers) {
+          const video = await server.videos.get({ id: videoUUID })
 
-  it('Should have the videos listed on the two instances', async function () {
-    this.timeout(120_000)
+          expect(video.name).to.equal('transcoded video')
+          expect(video.files).to.have.lengthOf(4)
+        }
+      })
+
+      it('Should import no HDR version on a HDR video', async function () {
+        this.timeout(300_000)
+
+        const config = {
+          transcoding: {
+            enabled: true,
+            resolutions: {
+              '240p': true,
+              '360p': false,
+              '480p': false,
+              '720p': false,
+              '1080p': false, // the resulting resolution shouldn't be higher than this, and not vp9.2/av01
+              '1440p': false,
+              '2160p': false
+            },
+            webtorrent: { enabled: true },
+            hls: { enabled: false }
+          },
+          import: {
+            videos: {
+              http: {
+                enabled: true
+              },
+              torrent: {
+                enabled: true
+              }
+            }
+          }
+        }
+        await servers[0].config.updateCustomSubConfig({ newConfig: config })
 
-    await waitJobs(servers)
+        const attributes = {
+          name: 'hdr video',
+          targetUrl: FIXTURE_URLS.youtubeHDR,
+          channelId: servers[0].store.channel.id,
+          privacy: VideoPrivacy.PUBLIC
+        }
+        const { video: videoImported } = await servers[0].imports.importVideo({ attributes })
+        const videoUUID = videoImported.uuid
+
+        await waitJobs(servers)
+
+        // test resolution
+        const video = await servers[0].videos.get({ id: videoUUID })
+        expect(video.name).to.equal('hdr video')
+        const maxResolution = Math.max.apply(Math, video.files.map(function (o) { return o.resolution.id }))
+        expect(maxResolution, 'expected max resolution not met').to.equals(VideoResolution.H_240P)
+      })
+
+      it('Should import a peertube video', async function () {
+        this.timeout(120_000)
+
+        // TODO: include peertube_short when https://github.com/ytdl-org/youtube-dl/pull/29475 is merged
+        for (const targetUrl of [ FIXTURE_URLS.peertube_long ]) {
+        // for (const targetUrl of [ FIXTURE_URLS.peertube_long, FIXTURE_URLS.peertube_short ]) {
+          await servers[0].config.disableTranscoding()
+
+          const attributes = {
+            targetUrl,
+            channelId: servers[0].store.channel.id,
+            privacy: VideoPrivacy.PUBLIC
+          }
+          const { video } = await servers[0].imports.importVideo({ attributes })
+          const videoUUID = video.uuid
 
-    for (const server of servers) {
-      const { total, data } = await server.videos.list()
-      expect(total).to.equal(4)
-      expect(data).to.have.lengthOf(4)
+          await waitJobs(servers)
 
-      await checkVideoServer2(server, data[0].uuid)
+          for (const server of servers) {
+            const video = await server.videos.get({ id: videoUUID })
 
-      const [ , videoHttp, videoMagnet, videoTorrent ] = data
-      await checkVideosServer1(server, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
-    }
-  })
+            expect(video.name).to.equal('E2E tests')
+          }
+        }
+      })
 
-  it('Should import a video that will be transcoded', async function () {
-    this.timeout(240_000)
+      after(async function () {
+        await cleanupTests(servers)
+      })
+    })
+  }
 
-    const attributes = {
-      name: 'transcoded video',
-      magnetUri: FIXTURE_URLS.magnet,
-      channelId: channelIdServer2,
-      privacy: VideoPrivacy.PUBLIC
-    }
-    const { video } = await servers[1].imports.importVideo({ attributes })
-    const videoUUID = video.uuid
+  runSuite('youtube-dl')
 
-    await waitJobs(servers)
+  runSuite('yt-dlp')
 
-    for (const server of servers) {
-      const video = await server.videos.get({ id: videoUUID })
+  describe('Auto update', function () {
+    let server: PeerTubeServer
 
-      expect(video.name).to.equal('transcoded video')
-      expect(video.files).to.have.lengthOf(4)
+    function quickPeerTubeImport () {
+      const attributes = {
+        targetUrl: FIXTURE_URLS.peertube_long,
+        channelId: server.store.channel.id,
+        privacy: VideoPrivacy.PUBLIC
+      }
+
+      return server.imports.importVideo({ attributes })
     }
-  })
 
-  it('Should import no HDR version on a HDR video', async function () {
-    this.timeout(300_000)
-
-    const config = {
-      transcoding: {
-        enabled: true,
-        resolutions: {
-          '240p': true,
-          '360p': false,
-          '480p': false,
-          '720p': false,
-          '1080p': false, // the resulting resolution shouldn't be higher than this, and not vp9.2/av01
-          '1440p': false,
-          '2160p': false
-        },
-        webtorrent: { enabled: true },
-        hls: { enabled: false }
-      },
-      import: {
-        videos: {
-          http: {
-            enabled: true
-          },
-          torrent: {
-            enabled: true
+    async function testBinaryUpdate (releaseUrl: string, releaseName: string) {
+      await remove(join(server.servers.buildDirectory('bin'), releaseName))
+
+      await server.kill()
+      await server.run({
+        import: {
+          videos: {
+            http: {
+              youtube_dl_release: {
+                url: releaseUrl,
+                name: releaseName
+              }
+            }
           }
         }
-      }
-    }
-    await servers[0].config.updateCustomSubConfig({ newConfig: config })
+      })
+
+      await quickPeerTubeImport()
 
-    const attributes = {
-      name: 'hdr video',
-      targetUrl: FIXTURE_URLS.youtubeHDR,
-      channelId: channelIdServer1,
-      privacy: VideoPrivacy.PUBLIC
+      expect(await pathExists(join(server.servers.buildDirectory('bin'), releaseName))).to.be.true
     }
-    const { video: videoImported } = await servers[0].imports.importVideo({ attributes })
-    const videoUUID = videoImported.uuid
 
-    await waitJobs(servers)
+    before(async function () {
+      this.timeout(30_000)
 
-    // test resolution
-    const video = await servers[0].videos.get({ id: videoUUID })
-    expect(video.name).to.equal('hdr video')
-    const maxResolution = Math.max.apply(Math, video.files.map(function (o) { return o.resolution.id }))
-    expect(maxResolution, 'expected max resolution not met').to.equals(VideoResolution.H_240P)
-  })
+      // Run servers
+      server = await createSingleServer(1)
 
-  it('Should import a peertube video', async function () {
-    this.timeout(120_000)
+      await setAccessTokensToServers([ server ])
+      await setDefaultVideoChannel([ server ])
+    })
 
-    // TODO: include peertube_short when https://github.com/ytdl-org/youtube-dl/pull/29475 is merged
-    for (const targetUrl of [ FIXTURE_URLS.peertube_long ]) {
-    // for (const targetUrl of [ FIXTURE_URLS.peertube_long, FIXTURE_URLS.peertube_short ]) {
-      await servers[0].config.disableTranscoding()
+    it('Should update youtube-dl from github URL', async function () {
+      this.timeout(120_000)
 
-      const attributes = {
-        targetUrl,
-        channelId: channelIdServer1,
-        privacy: VideoPrivacy.PUBLIC
-      }
-      const { video } = await servers[0].imports.importVideo({ attributes })
-      const videoUUID = video.uuid
+      await testBinaryUpdate('https://api.github.com/repos/ytdl-org/youtube-dl/releases', 'youtube-dl')
+    })
 
-      await waitJobs(servers)
+    it('Should update youtube-dl from raw URL', async function () {
+      this.timeout(120_000)
 
-      for (const server of servers) {
-        const video = await server.videos.get({ id: videoUUID })
+      await testBinaryUpdate('https://yt-dl.org/downloads/latest/youtube-dl', 'youtube-dl')
+    })
 
-        expect(video.name).to.equal('E2E tests')
-      }
-    }
-  })
+    it('Should update youtube-dl from youtube-dl fork', async function () {
+      this.timeout(120_000)
 
-  after(async function () {
-    await cleanupTests(servers)
+      await testBinaryUpdate('https://api.github.com/repos/yt-dlp/yt-dlp/releases', 'yt-dlp')
+    })
   })
 })
diff --git a/server/tests/fixtures/video_import_preview_yt_dlp.jpg b/server/tests/fixtures/video_import_preview_yt_dlp.jpg
new file mode 100644
index 000000000..9e8833bf9
--- /dev/null
+++ b/server/tests/fixtures/video_import_preview_yt_dlp.jpg
diff --git a/server/tests/fixtures/video_import_thumbnail_yt_dlp.jpg b/server/tests/fixtures/video_import_thumbnail_yt_dlp.jpg
new file mode 100644
index 000000000..f672a785a
--- /dev/null
+++ b/server/tests/fixtures/video_import_thumbnail_yt_dlp.jpg