OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Faster user import/export tests

pull/6266/head
Chocobozzz 2024-02-13 11:40:27 +01:00 committed by Chocobozzz
parent 009d7b39ac
commit 967702d6c7
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/tests/src/api/users/user-import.ts
View File

@ -403,14 +403,6 @@ function runTest (withObjectStorage: boolean) {
resolution: 720, resolution: 720,
size: 61000 size: 61000
}, },
{
resolution: 480,
size: 40000
},
{
resolution: 360,
size: 32000
},
{ {
resolution: 240, resolution: 240,
size: 23000 size: 23000
@ -427,7 +419,7 @@ function runTest (withObjectStorage: boolean) {
servers: [ remoteServer, server ], servers: [ remoteServer, server ],
videoUUID: otherVideo.uuid, videoUUID: otherVideo.uuid,
objectStorageBaseUrl: objectStorage?.getMockPlaylistBaseUrl(), objectStorageBaseUrl: objectStorage?.getMockPlaylistBaseUrl(),
resolutions: [ 720, 480, 360, 240 ] resolutions: [ 720, 240 ]
}) })
const source = await remoteServer.videos.getSource({ id: otherVideo.uuid }) const source = await remoteServer.videos.getSource({ id: otherVideo.uuid })

14
packages/tests/src/shared/import-export.ts
View File

@ -127,11 +127,11 @@ export async function prepareImportExportTests (options: {
const emailPort = await MockSmtpServer.Instance.collectEmails(emails) const emailPort = await MockSmtpServer.Instance.collectEmails(emails)
const [ server, remoteServer, blockedServer ] = await Promise.all([ const [ server, remoteServer, blockedServer ] = await Promise.all([
await createSingleServer(1, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), createSingleServer(1, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }),
await createSingleServer(2, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }), createSingleServer(2, { ...objectStorageConfig, ...ConfigCommand.getEmailOverrideConfig(emailPort) }),
withBlockedServer withBlockedServer
? await createSingleServer(3) ? createSingleServer(3)
: Promise.resolve(undefined) : Promise.resolve(undefined)
]) ])
@ -140,15 +140,17 @@ export async function prepareImportExportTests (options: {
await setAccessTokensToServers(servers) await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers) await setDefaultVideoChannel(servers)
await remoteServer.config.enableMinimumTranscoding()
await Promise.all([ await Promise.all([
await doubleFollow(server, remoteServer), doubleFollow(server, remoteServer),
withBlockedServer withBlockedServer
? await doubleFollow(server, blockedServer) ? doubleFollow(server, blockedServer)
: Promise.resolve(undefined), : Promise.resolve(undefined),
withBlockedServer withBlockedServer
? await doubleFollow(remoteServer, blockedServer) ? doubleFollow(remoteServer, blockedServer)
: Promise.resolve(undefined) : Promise.resolve(undefined)
]) ])