diff --git a/packages/tests/src/api/users/user-import.ts b/packages/tests/src/api/users/user-import.ts index 7ad65a41a..6df7f2a8c 100644 --- a/packages/tests/src/api/users/user-import.ts +++ b/packages/tests/src/api/users/user-import.ts @@ -403,14 +403,6 @@ function runTest (withObjectStorage: boolean) { resolution: 720, size: 61000 }, - { - resolution: 480, - size: 40000 - }, - { - resolution: 360, - size: 32000 - }, { resolution: 240, size: 23000 @@ -427,7 +419,7 @@ function runTest (withObjectStorage: boolean) { servers: [ remoteServer, server ], videoUUID: otherVideo.uuid, objectStorageBaseUrl: objectStorage?.getMockPlaylistBaseUrl(), - resolutions: [ 720, 480, 360, 240 ] + resolutions: [ 720, 240 ] }) const source = await remoteServer.videos.getSource({ id: otherVideo.uuid }) diff --git a/packages/tests/src/shared/import-export.ts b/packages/tests/src/shared/import-export.ts index f0ae2db75..17b35f00b 100644 --- a/packages/tests/src/shared/import-export.ts +++ b/packages/tests/src/shared/import-export.ts @@ -127,11 +127,11 @@ export async function prepareImportExportTests (options: { const emailPort = await MockSmtpServer.Instance.collectEmails(emails) const [ server, remoteServer, blockedServer ] = await Promise.all([ - await createSingleServer(1, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), - await createSingleServer(2, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), + createSingleServer(1, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), + createSingleServer(2, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), withBlockedServer - ? await createSingleServer(3) + ? createSingleServer(3) : Promise.resolve(undefined) ]) @@ -140,15 +140,17 @@ export async function prepareImportExportTests (options: { await setAccessTokensToServers(servers) await setDefaultVideoChannel(servers) + await remoteServer.config.enableMinimumTranscoding() + await Promise.all([ - await doubleFollow(server, remoteServer), + doubleFollow(server, remoteServer), withBlockedServer - ? await doubleFollow(server, blockedServer) + ? doubleFollow(server, blockedServer) : Promise.resolve(undefined), withBlockedServer - ? await doubleFollow(remoteServer, blockedServer) + ? doubleFollow(remoteServer, blockedServer) : Promise.resolve(undefined) ])