Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils...

diff --cc server/tests/api/check-params/user-subscriptions.ts
index 2cf5a2415094682595246fc47d051f418e0d8e1f,6af7ed43b1fd3552f8e9fc17b766e5361d1912a2..8a9ced7c1526408aae5e7ee66387f0a39cbb0351
--- 1/server/tests/api/check-params/user-subscriptions.ts
--- 2/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@@ -13,12 -13,9 +13,14 @@@ import 
    ServerInfo,
    setAccessTokensToServers,
    userLogin
 -} from '../../utils'
 -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
 -import { waitJobs } from '../../utils/server/jobs'
 +} from '../../../../shared/utils'
++
 +import {
 +  checkBadCountPagination,
 +  checkBadSortPagination,
 +  checkBadStartPagination
 +} from '../../../../shared/utils/requests/check-api-params'
++import { waitJobs } from '../../../../shared/utils/server/jobs'
  
  describe('Test user subscriptions API validators', function () {
    const path = '/api/v1/users/me/subscriptions'

diff --cc server/tests/api/redundancy/redundancy.ts
index 663e31ead98b9ccd940d35ddb4d1eab345b93117,a8a2f305fd5a91c2b2c3413f11e7838faa5c0521..2bc1b60ce9816e22930fe7f11d76e5eb6739e9f9
--- 1/server/tests/api/redundancy/redundancy.ts
--- 2/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@@ -17,11 -17,11 +17,12 @@@ import 
    viewVideo,
    wait,
    waitUntilLog,
-   checkVideoFilesWereRemoved, removeVideo
+   checkVideoFilesWereRemoved, removeVideo, getVideoWithToken
 -} from '../../utils'
 -import { waitJobs } from '../../utils/server/jobs'
 +} from '../../../../shared/utils'
 +import { waitJobs } from '../../../../shared/utils/server/jobs'
++
  import * as magnetUtil from 'magnet-uri'
 -import { updateRedundancy } from '../../utils/server/redundancy'
 +import { updateRedundancy } from '../../../../shared/utils/server/redundancy'
  import { ActorFollow } from '../../../../shared/models/actors'
  import { readdir } from 'fs-extra'
  import { join } from 'path'