7 files changed, 705 insertions, 466 deletions

diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts
index fc8b447b7..5c07f8926 100644
--- a/server/tests/api/videos/index.ts
+++ b/server/tests/api/videos/index.ts
@@ -1,5 +1,6 @@
 import './audio-only'
 import './multiple-servers'
+import './resumable-upload'
 import './single-server'
 import './video-captions'
 import './video-change-ownership'
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 55e280e9f..6aa996038 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
 import { join } from 'path'
 import * as request from 'supertest'
-import { VideoPrivacy } from '../../../../shared/models/videos'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
   addVideoChannel,
   checkTmpIsEmpty,
@@ -32,16 +31,16 @@ import {
   wait,
   webtorrentAdd
 } from '../../../../shared/extra-utils'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import {
   addVideoCommentReply,
   addVideoCommentThread,
   deleteVideoComment,
+  findCommentId,
   getVideoCommentThreads,
-  getVideoThreadComments,
-  findCommentId
+  getVideoThreadComments
 } from '../../../../shared/extra-utils/videos/video-comments'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { VideoComment, VideoCommentThreadTree, VideoPrivacy } from '../../../../shared/models/videos'
 
 const expect = chai.expect
 
@@ -181,7 +180,7 @@ describe('Test multiple servers', function () {
         thumbnailfile: 'thumbnail.jpg',
         previewfile: 'preview.jpg'
       }
-      await uploadVideo(servers[1].url, userAccessToken, videoAttributes)
+      await uploadVideo(servers[1].url, userAccessToken, videoAttributes, HttpStatusCode.OK_200, 'resumable')
 
       // Transcoding
       await waitJobs(servers)
diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts
new file mode 100644
index 000000000..af9221c43
--- /dev/null
+++ b/server/tests/api/videos/resumable-upload.ts
@@ -0,0 +1,187 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+
+import 'mocha'
+import * as chai from 'chai'
+import { pathExists, readdir, stat } from 'fs-extra'
+import { join } from 'path'
+import { HttpStatusCode } from '@shared/core-utils'
+import {
+  buildAbsoluteFixturePath,
+  buildServerDirectory,
+  flushAndRunServer,
+  getMyUserInformation,
+  prepareResumableUpload,
+  sendDebugCommand,
+  sendResumableChunks,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  updateUser
+} from '@shared/extra-utils'
+import { MyUser, VideoPrivacy } from '@shared/models'
+
+const expect = chai.expect
+
+// Most classic resumable upload tests are done in other test suites
+
+describe('Test resumable upload', function () {
+  const defaultFixture = 'video_short.mp4'
+  let server: ServerInfo
+  let rootId: number
+
+  async function buildSize (fixture: string, size?: number) {
+    if (size !== undefined) return size
+
+    const baseFixture = buildAbsoluteFixturePath(fixture)
+    return (await stat(baseFixture)).size
+  }
+
+  async function prepareUpload (sizeArg?: number) {
+    const size = await buildSize(defaultFixture, sizeArg)
+
+    const attributes = {
+      name: 'video',
+      channelId: server.videoChannel.id,
+      privacy: VideoPrivacy.PUBLIC,
+      fixture: defaultFixture
+    }
+
+    const mimetype = 'video/mp4'
+
+    const res = await prepareResumableUpload({ url: server.url, token: server.accessToken, attributes, size, mimetype })
+
+    return res.header['location'].split('?')[1]
+  }
+
+  async function sendChunks (options: {
+    pathUploadId: string
+    size?: number
+    expectedStatus?: HttpStatusCode
+    contentLength?: number
+    contentRange?: string
+    contentRangeBuilder?: (start: number, chunk: any) => string
+  }) {
+    const { pathUploadId, expectedStatus, contentLength, contentRangeBuilder } = options
+
+    const size = await buildSize(defaultFixture, options.size)
+    const absoluteFilePath = buildAbsoluteFixturePath(defaultFixture)
+
+    return sendResumableChunks({
+      url: server.url,
+      token: server.accessToken,
+      pathUploadId,
+      videoFilePath: absoluteFilePath,
+      size,
+      contentLength,
+      contentRangeBuilder,
+      specialStatus: expectedStatus
+    })
+  }
+
+  async function checkFileSize (uploadIdArg: string, expectedSize: number | null) {
+    const uploadId = uploadIdArg.replace(/^upload_id=/, '')
+
+    const subPath = join('tmp', 'resumable-uploads', uploadId)
+    const filePath = buildServerDirectory(server, subPath)
+    const exists = await pathExists(filePath)
+
+    if (expectedSize === null) {
+      expect(exists).to.be.false
+      return
+    }
+
+    expect(exists).to.be.true
+
+    expect((await stat(filePath)).size).to.equal(expectedSize)
+  }
+
+  async function countResumableUploads () {
+    const subPath = join('tmp', 'resumable-uploads')
+    const filePath = buildServerDirectory(server, subPath)
+
+    const files = await readdir(filePath)
+    return files.length
+  }
+
+  before(async function () {
+    this.timeout(30000)
+
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+    await setDefaultVideoChannel([ server ])
+
+    const res = await getMyUserInformation(server.url, server.accessToken)
+    rootId = (res.body as MyUser).id
+
+    await updateUser({
+      url: server.url,
+      userId: rootId,
+      accessToken: server.accessToken,
+      videoQuota: 10_000_000
+    })
+  })
+
+  describe('Directory cleaning', function () {
+
+    it('Should correctly delete files after an upload', async function () {
+      const uploadId = await prepareUpload()
+      await sendChunks({ pathUploadId: uploadId })
+
+      expect(await countResumableUploads()).to.equal(0)
+    })
+
+    it('Should not delete files after an unfinished upload', async function () {
+      await prepareUpload()
+
+      expect(await countResumableUploads()).to.equal(2)
+    })
+
+    it('Should not delete recent uploads', async function () {
+      await sendDebugCommand(server.url, server.accessToken, { command: 'remove-dandling-resumable-uploads' })
+
+      expect(await countResumableUploads()).to.equal(2)
+    })
+
+    it('Should delete old uploads', async function () {
+      await sendDebugCommand(server.url, server.accessToken, { command: 'remove-dandling-resumable-uploads' })
+
+      expect(await countResumableUploads()).to.equal(0)
+    })
+  })
+
+  describe('Resumable upload and chunks', function () {
+
+    it('Should accept the same amount of chunks', async function () {
+      const uploadId = await prepareUpload()
+      await sendChunks({ pathUploadId: uploadId })
+
+      await checkFileSize(uploadId, null)
+    })
+
+    it('Should not accept more chunks than expected', async function () {
+      const size = 100
+      const uploadId = await prepareUpload(size)
+
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409 })
+      await checkFileSize(uploadId, 0)
+    })
+
+    it('Should not accept more chunks than expected with an invalid content length/content range', async function () {
+      const uploadId = await prepareUpload(1500)
+
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 })
+      await checkFileSize(uploadId, 0)
+    })
+
+    it('Should not accept more chunks than expected with an invalid content length', async function () {
+      const uploadId = await prepareUpload(500)
+
+      const size = 1000
+
+      const contentRangeBuilder = start => `bytes ${start}-${start + size - 1}/${size}`
+      await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentRangeBuilder, contentLength: size })
+      await checkFileSize(uploadId, 0)
+    })
+  })
+
+})
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index a79648bf7..1058a1e9c 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
+import 'mocha'
 import * as chai from 'chai'
 import { keyBy } from 'lodash'
-import 'mocha'
-import { VideoPrivacy } from '../../../../shared/models/videos'
+
 import {
   checkVideoFilesWereRemoved,
   cleanupTests,
@@ -28,430 +28,432 @@ import {
   viewVideo,
   wait
 } from '../../../../shared/extra-utils'
+import { VideoPrivacy } from '../../../../shared/models/videos'
+import { HttpStatusCode } from '@shared/core-utils'
 
 const expect = chai.expect
 
 describe('Test a single server', function () {
-  let server: ServerInfo = null
-  let videoId = -1
-  let videoId2 = -1
-  let videoUUID = ''
-  let videosListBase: any[] = null
-
-  const getCheckAttributes = () => ({
-    name: 'my super name',
-    category: 2,
-    licence: 6,
-    language: 'zh',
-    nsfw: true,
-    description: 'my super description',
-    support: 'my super support text',
-    account: {
-      name: 'root',
-      host: 'localhost:' + server.port
-    },
-    isLocal: true,
-    duration: 5,
-    tags: [ 'tag1', 'tag2', 'tag3' ],
-    privacy: VideoPrivacy.PUBLIC,
-    commentsEnabled: true,
-    downloadEnabled: true,
-    channel: {
-      displayName: 'Main root channel',
-      name: 'root_channel',
-      description: '',
-      isLocal: true
-    },
-    fixture: 'video_short.webm',
-    files: [
-      {
-        resolution: 720,
-        size: 218910
-      }
-    ]
-  })
-
-  const updateCheckAttributes = () => ({
-    name: 'my super video updated',
-    category: 4,
-    licence: 2,
-    language: 'ar',
-    nsfw: false,
-    description: 'my super description updated',
-    support: 'my super support text updated',
-    account: {
-      name: 'root',
-      host: 'localhost:' + server.port
-    },
-    isLocal: true,
-    tags: [ 'tagup1', 'tagup2' ],
-    privacy: VideoPrivacy.PUBLIC,
-    duration: 5,
-    commentsEnabled: false,
-    downloadEnabled: false,
-    channel: {
-      name: 'root_channel',
-      displayName: 'Main root channel',
-      description: '',
-      isLocal: true
-    },
-    fixture: 'video_short3.webm',
-    files: [
-      {
-        resolution: 720,
-        size: 292677
-      }
-    ]
-  })
-
-  before(async function () {
-    this.timeout(30000)
-
-    server = await flushAndRunServer(1)
-
-    await setAccessTokensToServers([ server ])
-  })
-
-  it('Should list video categories', async function () {
-    const res = await getVideoCategories(server.url)
-
-    const categories = res.body
-    expect(Object.keys(categories)).to.have.length.above(10)
-
-    expect(categories[11]).to.equal('News & Politics')
-  })
-
-  it('Should list video licences', async function () {
-    const res = await getVideoLicences(server.url)
-
-    const licences = res.body
-    expect(Object.keys(licences)).to.have.length.above(5)
-
-    expect(licences[3]).to.equal('Attribution - No Derivatives')
-  })
-
-  it('Should list video languages', async function () {
-    const res = await getVideoLanguages(server.url)
-
-    const languages = res.body
-    expect(Object.keys(languages)).to.have.length.above(5)
-
-    expect(languages['ru']).to.equal('Russian')
-  })
-
-  it('Should list video privacies', async function () {
-    const res = await getVideoPrivacies(server.url)
-
-    const privacies = res.body
-    expect(Object.keys(privacies)).to.have.length.at.least(3)
-
-    expect(privacies[3]).to.equal('Private')
-  })
-
-  it('Should not have videos', async function () {
-    const res = await getVideosList(server.url)
-
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(0)
-  })
 
-  it('Should upload the video', async function () {
-    this.timeout(10000)
+  function runSuite (mode: 'legacy' | 'resumable') {
+    let server: ServerInfo = null
+    let videoId = -1
+    let videoId2 = -1
+    let videoUUID = ''
+    let videosListBase: any[] = null
 
-    const videoAttributes = {
+    const getCheckAttributes = () => ({
       name: 'my super name',
       category: 2,
-      nsfw: true,
       licence: 6,
-      tags: [ 'tag1', 'tag2', 'tag3' ]
-    }
-    const res = await uploadVideo(server.url, server.accessToken, videoAttributes)
-    expect(res.body.video).to.not.be.undefined
-    expect(res.body.video.id).to.equal(1)
-    expect(res.body.video.uuid).to.have.length.above(5)
-
-    videoId = res.body.video.id
-    videoUUID = res.body.video.uuid
-  })
-
-  it('Should get and seed the uploaded video', async function () {
-    this.timeout(5000)
-
-    const res = await getVideosList(server.url)
-
-    expect(res.body.total).to.equal(1)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(1)
-
-    const video = res.body.data[0]
-    await completeVideoCheck(server.url, video, getCheckAttributes())
-  })
+      language: 'zh',
+      nsfw: true,
+      description: 'my super description',
+      support: 'my super support text',
+      account: {
+        name: 'root',
+        host: 'localhost:' + server.port
+      },
+      isLocal: true,
+      duration: 5,
+      tags: [ 'tag1', 'tag2', 'tag3' ],
+      privacy: VideoPrivacy.PUBLIC,
+      commentsEnabled: true,
+      downloadEnabled: true,
+      channel: {
+        displayName: 'Main root channel',
+        name: 'root_channel',
+        description: '',
+        isLocal: true
+      },
+      fixture: 'video_short.webm',
+      files: [
+        {
+          resolution: 720,
+          size: 218910
+        }
+      ]
+    })
+
+    const updateCheckAttributes = () => ({
+      name: 'my super video updated',
+      category: 4,
+      licence: 2,
+      language: 'ar',
+      nsfw: false,
+      description: 'my super description updated',
+      support: 'my super support text updated',
+      account: {
+        name: 'root',
+        host: 'localhost:' + server.port
+      },
+      isLocal: true,
+      tags: [ 'tagup1', 'tagup2' ],
+      privacy: VideoPrivacy.PUBLIC,
+      duration: 5,
+      commentsEnabled: false,
+      downloadEnabled: false,
+      channel: {
+        name: 'root_channel',
+        displayName: 'Main root channel',
+        description: '',
+        isLocal: true
+      },
+      fixture: 'video_short3.webm',
+      files: [
+        {
+          resolution: 720,
+          size: 292677
+        }
+      ]
+    })
 
-  it('Should get the video by UUID', async function () {
-    this.timeout(5000)
+    before(async function () {
+      this.timeout(30000)
 
-    const res = await getVideo(server.url, videoUUID)
+      server = await flushAndRunServer(1)
 
-    const video = res.body
-    await completeVideoCheck(server.url, video, getCheckAttributes())
-  })
+      await setAccessTokensToServers([ server ])
+    })
 
-  it('Should have the views updated', async function () {
-    this.timeout(20000)
+    it('Should list video categories', async function () {
+      const res = await getVideoCategories(server.url)
 
-    await viewVideo(server.url, videoId)
-    await viewVideo(server.url, videoId)
-    await viewVideo(server.url, videoId)
+      const categories = res.body
+      expect(Object.keys(categories)).to.have.length.above(10)
 
-    await wait(1500)
+      expect(categories[11]).to.equal('News & Politics')
+    })
 
-    await viewVideo(server.url, videoId)
-    await viewVideo(server.url, videoId)
+    it('Should list video licences', async function () {
+      const res = await getVideoLicences(server.url)
 
-    await wait(1500)
+      const licences = res.body
+      expect(Object.keys(licences)).to.have.length.above(5)
 
-    await viewVideo(server.url, videoId)
-    await viewVideo(server.url, videoId)
+      expect(licences[3]).to.equal('Attribution - No Derivatives')
+    })
 
-    // Wait the repeatable job
-    await wait(8000)
+    it('Should list video languages', async function () {
+      const res = await getVideoLanguages(server.url)
 
-    const res = await getVideo(server.url, videoId)
+      const languages = res.body
+      expect(Object.keys(languages)).to.have.length.above(5)
 
-    const video = res.body
-    expect(video.views).to.equal(3)
-  })
+      expect(languages['ru']).to.equal('Russian')
+    })
 
-  it('Should remove the video', async function () {
-    await removeVideo(server.url, server.accessToken, videoId)
+    it('Should list video privacies', async function () {
+      const res = await getVideoPrivacies(server.url)
 
-    await checkVideoFilesWereRemoved(videoUUID, 1)
-  })
+      const privacies = res.body
+      expect(Object.keys(privacies)).to.have.length.at.least(3)
 
-  it('Should not have videos', async function () {
-    const res = await getVideosList(server.url)
+      expect(privacies[3]).to.equal('Private')
+    })
 
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data).to.have.lengthOf(0)
-  })
+    it('Should not have videos', async function () {
+      const res = await getVideosList(server.url)
 
-  it('Should upload 6 videos', async function () {
-    this.timeout(25000)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+    })
 
-    const videos = new Set([
-      'video_short.mp4', 'video_short.ogv', 'video_short.webm',
-      'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
-    ])
+    it('Should upload the video', async function () {
+      this.timeout(10000)
 
-    for (const video of videos) {
       const videoAttributes = {
-        name: video + ' name',
-        description: video + ' description',
+        name: 'my super name',
         category: 2,
-        licence: 1,
-        language: 'en',
         nsfw: true,
-        tags: [ 'tag1', 'tag2', 'tag3' ],
-        fixture: video
+        licence: 6,
+        tags: [ 'tag1', 'tag2', 'tag3' ]
       }
+      const res = await uploadVideo(server.url, server.accessToken, videoAttributes, HttpStatusCode.OK_200, mode)
+      expect(res.body.video).to.not.be.undefined
+      expect(res.body.video.id).to.equal(1)
+      expect(res.body.video.uuid).to.have.length.above(5)
 
-      await uploadVideo(server.url, server.accessToken, videoAttributes)
-    }
-  })
+      videoId = res.body.video.id
+      videoUUID = res.body.video.uuid
+    })
 
-  it('Should have the correct durations', async function () {
-    const res = await getVideosList(server.url)
-
-    expect(res.body.total).to.equal(6)
-    const videos = res.body.data
-    expect(videos).to.be.an('array')
-    expect(videos).to.have.lengthOf(6)
-
-    const videosByName = keyBy<{ duration: number }>(videos, 'name')
-    expect(videosByName['video_short.mp4 name'].duration).to.equal(5)
-    expect(videosByName['video_short.ogv name'].duration).to.equal(5)
-    expect(videosByName['video_short.webm name'].duration).to.equal(5)
-    expect(videosByName['video_short1.webm name'].duration).to.equal(10)
-    expect(videosByName['video_short2.webm name'].duration).to.equal(5)
-    expect(videosByName['video_short3.webm name'].duration).to.equal(5)
-  })
+    it('Should get and seed the uploaded video', async function () {
+      this.timeout(5000)
 
-  it('Should have the correct thumbnails', async function () {
-    const res = await getVideosList(server.url)
+      const res = await getVideosList(server.url)
 
-    const videos = res.body.data
-    // For the next test
-    videosListBase = videos
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(1)
 
-    for (const video of videos) {
-      const videoName = video.name.replace(' name', '')
-      await testImage(server.url, videoName, video.thumbnailPath)
-    }
-  })
+      const video = res.body.data[0]
+      await completeVideoCheck(server.url, video, getCheckAttributes())
+    })
 
-  it('Should list only the two first videos', async function () {
-    const res = await getVideosListPagination(server.url, 0, 2, 'name')
+    it('Should get the video by UUID', async function () {
+      this.timeout(5000)
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-    expect(videos[0].name).to.equal(videosListBase[0].name)
-    expect(videos[1].name).to.equal(videosListBase[1].name)
-  })
+      const res = await getVideo(server.url, videoUUID)
 
-  it('Should list only the next three videos', async function () {
-    const res = await getVideosListPagination(server.url, 2, 3, 'name')
+      const video = res.body
+      await completeVideoCheck(server.url, video, getCheckAttributes())
+    })
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(3)
-    expect(videos[0].name).to.equal(videosListBase[2].name)
-    expect(videos[1].name).to.equal(videosListBase[3].name)
-    expect(videos[2].name).to.equal(videosListBase[4].name)
-  })
+    it('Should have the views updated', async function () {
+      this.timeout(20000)
 
-  it('Should list the last video', async function () {
-    const res = await getVideosListPagination(server.url, 5, 6, 'name')
+      await viewVideo(server.url, videoId)
+      await viewVideo(server.url, videoId)
+      await viewVideo(server.url, videoId)
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(1)
-    expect(videos[0].name).to.equal(videosListBase[5].name)
-  })
+      await wait(1500)
 
-  it('Should not have the total field', async function () {
-    const res = await getVideosListPagination(server.url, 5, 6, 'name', true)
+      await viewVideo(server.url, videoId)
+      await viewVideo(server.url, videoId)
 
-    const videos = res.body.data
-    expect(res.body.total).to.not.exist
-    expect(videos.length).to.equal(1)
-    expect(videos[0].name).to.equal(videosListBase[5].name)
-  })
+      await wait(1500)
 
-  it('Should list and sort by name in descending order', async function () {
-    const res = await getVideosListSort(server.url, '-name')
-
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(6)
-    expect(videos[0].name).to.equal('video_short.webm name')
-    expect(videos[1].name).to.equal('video_short.ogv name')
-    expect(videos[2].name).to.equal('video_short.mp4 name')
-    expect(videos[3].name).to.equal('video_short3.webm name')
-    expect(videos[4].name).to.equal('video_short2.webm name')
-    expect(videos[5].name).to.equal('video_short1.webm name')
-
-    videoId = videos[3].uuid
-    videoId2 = videos[5].uuid
-  })
+      await viewVideo(server.url, videoId)
+      await viewVideo(server.url, videoId)
 
-  it('Should list and sort by trending in descending order', async function () {
-    const res = await getVideosListPagination(server.url, 0, 2, '-trending')
+      // Wait the repeatable job
+      await wait(8000)
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-  })
+      const res = await getVideo(server.url, videoId)
 
-  it('Should list and sort by hotness in descending order', async function () {
-    const res = await getVideosListPagination(server.url, 0, 2, '-hot')
+      const video = res.body
+      expect(video.views).to.equal(3)
+    })
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-  })
+    it('Should remove the video', async function () {
+      await removeVideo(server.url, server.accessToken, videoId)
 
-  it('Should list and sort by best in descending order', async function () {
-    const res = await getVideosListPagination(server.url, 0, 2, '-best')
+      await checkVideoFilesWereRemoved(videoUUID, 1)
+    })
 
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(2)
-  })
+    it('Should not have videos', async function () {
+      const res = await getVideosList(server.url)
 
-  it('Should update a video', async function () {
-    const attributes = {
-      name: 'my super video updated',
-      category: 4,
-      licence: 2,
-      language: 'ar',
-      nsfw: false,
-      description: 'my super description updated',
-      commentsEnabled: false,
-      downloadEnabled: false,
-      tags: [ 'tagup1', 'tagup2' ]
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
-  })
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    })
 
-  it('Should filter by tags and category', async function () {
-    const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 4 ] })
-    expect(res1.body.total).to.equal(1)
-    expect(res1.body.data[0].name).to.equal('my super video updated')
+    it('Should upload 6 videos', async function () {
+      this.timeout(25000)
 
-    const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 3 ] })
-    expect(res2.body.total).to.equal(0)
-  })
+      const videos = new Set([
+        'video_short.mp4', 'video_short.ogv', 'video_short.webm',
+        'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
+      ])
 
-  it('Should have the video updated', async function () {
-    this.timeout(60000)
+      for (const video of videos) {
+        const videoAttributes = {
+          name: video + ' name',
+          description: video + ' description',
+          category: 2,
+          licence: 1,
+          language: 'en',
+          nsfw: true,
+          tags: [ 'tag1', 'tag2', 'tag3' ],
+          fixture: video
+        }
 
-    const res = await getVideo(server.url, videoId)
-    const video = res.body
+        await uploadVideo(server.url, server.accessToken, videoAttributes, HttpStatusCode.OK_200, mode)
+      }
+    })
+
+    it('Should have the correct durations', async function () {
+      const res = await getVideosList(server.url)
+
+      expect(res.body.total).to.equal(6)
+      const videos = res.body.data
+      expect(videos).to.be.an('array')
+      expect(videos).to.have.lengthOf(6)
+
+      const videosByName = keyBy<{ duration: number }>(videos, 'name')
+      expect(videosByName['video_short.mp4 name'].duration).to.equal(5)
+      expect(videosByName['video_short.ogv name'].duration).to.equal(5)
+      expect(videosByName['video_short.webm name'].duration).to.equal(5)
+      expect(videosByName['video_short1.webm name'].duration).to.equal(10)
+      expect(videosByName['video_short2.webm name'].duration).to.equal(5)
+      expect(videosByName['video_short3.webm name'].duration).to.equal(5)
+    })
+
+    it('Should have the correct thumbnails', async function () {
+      const res = await getVideosList(server.url)
+
+      const videos = res.body.data
+      // For the next test
+      videosListBase = videos
+
+      for (const video of videos) {
+        const videoName = video.name.replace(' name', '')
+        await testImage(server.url, videoName, video.thumbnailPath)
+      }
+    })
+
+    it('Should list only the two first videos', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, 'name')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+      expect(videos[0].name).to.equal(videosListBase[0].name)
+      expect(videos[1].name).to.equal(videosListBase[1].name)
+    })
+
+    it('Should list only the next three videos', async function () {
+      const res = await getVideosListPagination(server.url, 2, 3, 'name')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(3)
+      expect(videos[0].name).to.equal(videosListBase[2].name)
+      expect(videos[1].name).to.equal(videosListBase[3].name)
+      expect(videos[2].name).to.equal(videosListBase[4].name)
+    })
+
+    it('Should list the last video', async function () {
+      const res = await getVideosListPagination(server.url, 5, 6, 'name')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(1)
+      expect(videos[0].name).to.equal(videosListBase[5].name)
+    })
+
+    it('Should not have the total field', async function () {
+      const res = await getVideosListPagination(server.url, 5, 6, 'name', true)
+
+      const videos = res.body.data
+      expect(res.body.total).to.not.exist
+      expect(videos.length).to.equal(1)
+      expect(videos[0].name).to.equal(videosListBase[5].name)
+    })
+
+    it('Should list and sort by name in descending order', async function () {
+      const res = await getVideosListSort(server.url, '-name')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(6)
+      expect(videos[0].name).to.equal('video_short.webm name')
+      expect(videos[1].name).to.equal('video_short.ogv name')
+      expect(videos[2].name).to.equal('video_short.mp4 name')
+      expect(videos[3].name).to.equal('video_short3.webm name')
+      expect(videos[4].name).to.equal('video_short2.webm name')
+      expect(videos[5].name).to.equal('video_short1.webm name')
+
+      videoId = videos[3].uuid
+      videoId2 = videos[5].uuid
+    })
+
+    it('Should list and sort by trending in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-trending')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+
+    it('Should list and sort by hotness in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-hot')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+
+    it('Should list and sort by best in descending order', async function () {
+      const res = await getVideosListPagination(server.url, 0, 2, '-best')
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(2)
+    })
+
+    it('Should update a video', async function () {
+      const attributes = {
+        name: 'my super video updated',
+        category: 4,
+        licence: 2,
+        language: 'ar',
+        nsfw: false,
+        description: 'my super description updated',
+        commentsEnabled: false,
+        downloadEnabled: false,
+        tags: [ 'tagup1', 'tagup2' ]
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
+    })
 
-    await completeVideoCheck(server.url, video, updateCheckAttributes())
-  })
+    it('Should filter by tags and category', async function () {
+      const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 4 ] })
+      expect(res1.body.total).to.equal(1)
+      expect(res1.body.data[0].name).to.equal('my super video updated')
 
-  it('Should update only the tags of a video', async function () {
-    const attributes = {
-      tags: [ 'supertag', 'tag1', 'tag2' ]
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
+      const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: [ 3 ] })
+      expect(res2.body.total).to.equal(0)
+    })
 
-    const res = await getVideo(server.url, videoId)
-    const video = res.body
+    it('Should have the video updated', async function () {
+      this.timeout(60000)
 
-    await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes(), attributes))
-  })
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
 
-  it('Should update only the description of a video', async function () {
-    const attributes = {
-      description: 'hello everybody'
-    }
-    await updateVideo(server.url, server.accessToken, videoId, attributes)
+      await completeVideoCheck(server.url, video, updateCheckAttributes())
+    })
 
-    const res = await getVideo(server.url, videoId)
-    const video = res.body
+    it('Should update only the tags of a video', async function () {
+      const attributes = {
+        tags: [ 'supertag', 'tag1', 'tag2' ]
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
 
-    const expectedAttributes = Object.assign(updateCheckAttributes(), { tags: [ 'supertag', 'tag1', 'tag2' ] }, attributes)
-    await completeVideoCheck(server.url, video, expectedAttributes)
-  })
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
 
-  it('Should like a video', async function () {
-    await rateVideo(server.url, server.accessToken, videoId, 'like')
+      await completeVideoCheck(server.url, video, Object.assign(updateCheckAttributes(), attributes))
+    })
 
-    const res = await getVideo(server.url, videoId)
-    const video = res.body
+    it('Should update only the description of a video', async function () {
+      const attributes = {
+        description: 'hello everybody'
+      }
+      await updateVideo(server.url, server.accessToken, videoId, attributes)
 
-    expect(video.likes).to.equal(1)
-    expect(video.dislikes).to.equal(0)
-  })
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
 
-  it('Should dislike the same video', async function () {
-    await rateVideo(server.url, server.accessToken, videoId, 'dislike')
+      const expectedAttributes = Object.assign(updateCheckAttributes(), { tags: [ 'supertag', 'tag1', 'tag2' ] }, attributes)
+      await completeVideoCheck(server.url, video, expectedAttributes)
+    })
 
-    const res = await getVideo(server.url, videoId)
-    const video = res.body
+    it('Should like a video', async function () {
+      await rateVideo(server.url, server.accessToken, videoId, 'like')
 
-    expect(video.likes).to.equal(0)
-    expect(video.dislikes).to.equal(1)
-  })
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
 
-  it('Should sort by originallyPublishedAt', async function () {
-    {
+      expect(video.likes).to.equal(1)
+      expect(video.dislikes).to.equal(0)
+    })
 
+    it('Should dislike the same video', async function () {
+      await rateVideo(server.url, server.accessToken, videoId, 'dislike')
+
+      const res = await getVideo(server.url, videoId)
+      const video = res.body
+
+      expect(video.likes).to.equal(0)
+      expect(video.dislikes).to.equal(1)
+    })
+
+    it('Should sort by originallyPublishedAt', async function () {
       {
         const now = new Date()
         const attributes = { originallyPublishedAt: now.toISOString() }
@@ -483,10 +485,18 @@ describe('Test a single server', function () {
         expect(names[4]).to.equal('video_short.ogv name')
         expect(names[5]).to.equal('video_short.mp4 name')
       }
-    }
+    })
+
+    after(async function () {
+      await cleanupTests([ server ])
+    })
+  }
+
+  describe('Legacy upload', function () {
+    runSuite('legacy')
   })
 
-  after(async function () {
-    await cleanupTests([ server ])
+  describe('Resumable upload', function () {
+    runSuite('resumable')
   })
 })
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index d12d58e75..7e7ad028c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 import * as chai from 'chai'
 import { basename } from 'path'
+import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import {
   cleanupTests,
   createUser,
@@ -13,6 +14,7 @@ import {
   getVideo,
   getVideoChannel,
   getVideoChannelVideos,
+  setDefaultVideoChannel,
   testImage,
   updateVideo,
   updateVideoChannelImage,
@@ -33,7 +35,6 @@ import {
 } from '../../../../shared/extra-utils/index'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index'
-import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 
 const expect = chai.expect
 
@@ -47,9 +48,10 @@ async function findChannel (server: ServerInfo, channelId: number) {
 describe('Test video channels', function () {
   let servers: ServerInfo[]
   let userInfo: User
-  let firstVideoChannelId: number
   let secondVideoChannelId: number
+  let totoChannel: number
   let videoUUID: string
+  let accountName: string
 
   before(async function () {
     this.timeout(60000)
@@ -57,16 +59,9 @@ describe('Test video channels', function () {
     servers = await flushAndRunMultipleServers(2)
 
     await setAccessTokensToServers(servers)
-    await doubleFollow(servers[0], servers[1])
-
-    {
-      const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
-      const user: User = res.body
-
-      firstVideoChannelId = user.videoChannels[0].id
-    }
+    await setDefaultVideoChannel(servers)
 
-    await waitJobs(servers)
+    await doubleFollow(servers[0], servers[1])
   })
 
   it('Should have one video channel (created with root)', async () => {
@@ -116,12 +111,14 @@ describe('Test video channels', function () {
     expect(videoChannels[1].displayName).to.equal('second video channel')
     expect(videoChannels[1].description).to.equal('super video channel description')
     expect(videoChannels[1].support).to.equal('super video channel support text')
+
+    accountName = userInfo.account.name + '@' + userInfo.account.host
   })
 
   it('Should have two video channels when getting account channels on server 1', async function () {
     const res = await getAccountVideoChannelsList({
       url: servers[0].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host
+      accountName
     })
 
     expect(res.body.total).to.equal(2)
@@ -142,7 +139,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         start: 0,
         count: 1,
         sort: 'createdAt'
@@ -158,7 +155,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         start: 0,
         count: 1,
         sort: '-createdAt'
@@ -174,7 +171,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         start: 1,
         count: 1,
         sort: '-createdAt'
@@ -191,7 +188,7 @@ describe('Test video channels', function () {
   it('Should have one video channel when getting account channels on server 2', async function () {
     const res = await getAccountVideoChannelsList({
       url: servers[1].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host
+      accountName
     })
 
     expect(res.body.total).to.equal(1)
@@ -379,7 +376,7 @@ describe('Test video channels', function () {
   it('Should change the video channel of a video', async function () {
     this.timeout(10000)
 
-    await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: firstVideoChannelId })
+    await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: servers[0].videoChannel.id })
 
     await waitJobs(servers)
   })
@@ -419,7 +416,8 @@ describe('Test video channels', function () {
   it('Should create the main channel with an uuid if there is a conflict', async function () {
     {
       const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' }
-      await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+      const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+      totoChannel = res.body.videoChannel.id
     }
 
     {
@@ -438,7 +436,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         withStats: true
       })
 
@@ -456,7 +454,7 @@ describe('Test video channels', function () {
     }
 
     {
-      // video has been posted on channel firstVideoChannelId since last update
+      // video has been posted on channel servers[0].videoChannel.id since last update
       await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.1,127.0.0.1')
       await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.2,127.0.0.1')
 
@@ -465,10 +463,10 @@ describe('Test video channels', function () {
 
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         withStats: true
       })
-      const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === firstVideoChannelId)
+      const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === servers[0].videoChannel.id)
       expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2)
     }
   })
@@ -476,7 +474,7 @@ describe('Test video channels', function () {
   it('Should report correct videos count', async function () {
     const res = await getAccountVideoChannelsList({
       url: servers[0].url,
-      accountName: userInfo.account.name + '@' + userInfo.account.host,
+      accountName,
       withStats: true
     })
     const channels: VideoChannel[] = res.body.data
@@ -492,7 +490,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         search: 'root'
       })
       expect(res.body.total).to.equal(1)
@@ -504,7 +502,7 @@ describe('Test video channels', function () {
     {
       const res = await getAccountVideoChannelsList({
         url: servers[0].url,
-        accountName: userInfo.account.name + '@' + userInfo.account.host,
+        accountName,
         search: 'does not exist'
       })
       expect(res.body.total).to.equal(0)
@@ -514,6 +512,40 @@ describe('Test video channels', function () {
     }
   })
 
+  it('Should list channels by updatedAt desc if a video has been uploaded', async function () {
+    this.timeout(30000)
+
+    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: totoChannel })
+    await waitJobs(servers)
+
+    for (const server of servers) {
+      const res = await getAccountVideoChannelsList({
+        url: server.url,
+        accountName,
+        sort: '-updatedAt'
+      })
+
+      const channels: VideoChannel[] = res.body.data
+      expect(channels[0].name).to.equal('toto_channel')
+      expect(channels[1].name).to.equal('root_channel')
+    }
+
+    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: servers[0].videoChannel.id })
+    await waitJobs(servers)
+
+    for (const server of servers) {
+      const res = await getAccountVideoChannelsList({
+        url: server.url,
+        accountName,
+        sort: '-updatedAt'
+      })
+
+      const channels: VideoChannel[] = res.body.data
+      expect(channels[0].name).to.equal('root_channel')
+      expect(channels[1].name).to.equal('toto_channel')
+    }
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index 615e0ea45..a5ff3a39d 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,7 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
-
+import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '@shared/models'
 import { cleanupTests, testImage } from '../../../../shared/extra-utils'
 import {
   createUser,
@@ -22,7 +22,6 @@ import {
   getVideoCommentThreads,
   getVideoThreadComments
 } from '../../../../shared/extra-utils/videos/video-comments'
-import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 1c99f26df..ea5ffd239 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -361,106 +361,117 @@ describe('Test video transcoding', function () {
 
   describe('Audio upload', function () {
 
-    before(async function () {
-      await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
-        transcoding: {
-          hls: { enabled: true },
-          webtorrent: { enabled: true },
-          resolutions: {
-            '0p': false,
-            '240p': false,
-            '360p': false,
-            '480p': false,
-            '720p': false,
-            '1080p': false,
-            '1440p': false,
-            '2160p': false
+    function runSuite (mode: 'legacy' | 'resumable') {
+
+      before(async function () {
+        await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
+          transcoding: {
+            hls: { enabled: true },
+            webtorrent: { enabled: true },
+            resolutions: {
+              '0p': false,
+              '240p': false,
+              '360p': false,
+              '480p': false,
+              '720p': false,
+              '1080p': false,
+              '1440p': false,
+              '2160p': false
+            }
           }
-        }
+        })
       })
-    })
-
-    it('Should merge an audio file with the preview file', async function () {
-      this.timeout(60_000)
-
-      const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
-      await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
 
-      await waitJobs(servers)
+      it('Should merge an audio file with the preview file', async function () {
+        this.timeout(60_000)
 
-      for (const server of servers) {
-        const res = await getVideosList(server.url)
+        const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
+        await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
 
-        const video = res.body.data.find(v => v.name === 'audio_with_preview')
-        const res2 = await getVideo(server.url, video.id)
-        const videoDetails: VideoDetails = res2.body
+        await waitJobs(servers)
 
-        expect(videoDetails.files).to.have.lengthOf(1)
+        for (const server of servers) {
+          const res = await getVideosList(server.url)
 
-        await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
-        await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const video = res.body.data.find(v => v.name === 'audio_with_preview')
+          const res2 = await getVideo(server.url, video.id)
+          const videoDetails: VideoDetails = res2.body
 
-        const magnetUri = videoDetails.files[0].magnetUri
-        expect(magnetUri).to.contain('.mp4')
-      }
-    })
+          expect(videoDetails.files).to.have.lengthOf(1)
 
-    it('Should upload an audio file and choose a default background image', async function () {
-      this.timeout(60_000)
+          await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
 
-      const videoAttributesArg = { name: 'audio_without_preview', fixture: 'sample.ogg' }
-      await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
+          const magnetUri = videoDetails.files[0].magnetUri
+          expect(magnetUri).to.contain('.mp4')
+        }
+      })
 
-      await waitJobs(servers)
+      it('Should upload an audio file and choose a default background image', async function () {
+        this.timeout(60_000)
 
-      for (const server of servers) {
-        const res = await getVideosList(server.url)
+        const videoAttributesArg = { name: 'audio_without_preview', fixture: 'sample.ogg' }
+        await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
 
-        const video = res.body.data.find(v => v.name === 'audio_without_preview')
-        const res2 = await getVideo(server.url, video.id)
-        const videoDetails = res2.body
+        await waitJobs(servers)
 
-        expect(videoDetails.files).to.have.lengthOf(1)
+        for (const server of servers) {
+          const res = await getVideosList(server.url)
 
-        await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
-        await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          const video = res.body.data.find(v => v.name === 'audio_without_preview')
+          const res2 = await getVideo(server.url, video.id)
+          const videoDetails = res2.body
 
-        const magnetUri = videoDetails.files[0].magnetUri
-        expect(magnetUri).to.contain('.mp4')
-      }
-    })
+          expect(videoDetails.files).to.have.lengthOf(1)
 
-    it('Should upload an audio file and create an audio version only', async function () {
-      this.timeout(60_000)
+          await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
+          await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
 
-      await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
-        transcoding: {
-          hls: { enabled: true },
-          webtorrent: { enabled: true },
-          resolutions: {
-            '0p': true,
-            '240p': false,
-            '360p': false
-          }
+          const magnetUri = videoDetails.files[0].magnetUri
+          expect(magnetUri).to.contain('.mp4')
         }
       })
 
-      const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
-      const resVideo = await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
+      it('Should upload an audio file and create an audio version only', async function () {
+        this.timeout(60_000)
+
+        await updateCustomSubConfig(servers[1].url, servers[1].accessToken, {
+          transcoding: {
+            hls: { enabled: true },
+            webtorrent: { enabled: true },
+            resolutions: {
+              '0p': true,
+              '240p': false,
+              '360p': false
+            }
+          }
+        })
 
-      await waitJobs(servers)
+        const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
+        const resVideo = await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg, HttpStatusCode.OK_200, mode)
 
-      for (const server of servers) {
-        const res2 = await getVideo(server.url, resVideo.body.video.id)
-        const videoDetails: VideoDetails = res2.body
+        await waitJobs(servers)
+
+        for (const server of servers) {
+          const res2 = await getVideo(server.url, resVideo.body.video.id)
+          const videoDetails: VideoDetails = res2.body
 
-        for (const files of [ videoDetails.files, videoDetails.streamingPlaylists[0].files ]) {
-          expect(files).to.have.lengthOf(2)
-          expect(files.find(f => f.resolution.id === 0)).to.not.be.undefined
+          for (const files of [ videoDetails.files, videoDetails.streamingPlaylists[0].files ]) {
+            expect(files).to.have.lengthOf(2)
+            expect(files.find(f => f.resolution.id === 0)).to.not.be.undefined
+          }
         }
-      }
 
-      await updateConfigForTranscoding(servers[1])
+        await updateConfigForTranscoding(servers[1])
+      })
+    }
+
+    describe('Legacy upload', function () {
+      runSuite('legacy')
+    })
+
+    describe('Resumable upload', function () {
+      runSuite('resumable')
     })
   })