From e82cb08722f076aea4fdfcfa53940e7e4a0ac419 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 25 Oct 2022 15:01:51 +0200 Subject: [PATCH] Fix proxy tests --- server/tests/api/object-storage/videos.ts | 4 ++-- server/tests/api/server/proxy.ts | 2 +- shared/server-commands/server/jobs.ts | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts index af3db9334..d1875febb 100644 --- a/server/tests/api/object-storage/videos.ts +++ b/server/tests/api/object-storage/videos.ts @@ -323,7 +323,7 @@ describe('Object storage for videos', function () { const { uuid } = await server.videos.quickUpload({ name: 'video' }) - await waitJobs([ server ], true) + await waitJobs([ server ], { skipDelayed: true }) const video = await server.videos.get({ id: uuid }) expectStartWith(video.files[0].fileUrl, server.url) @@ -358,7 +358,7 @@ describe('Object storage for videos', function () { const { uuid } = await server.videos.quickUpload({ name: 'video' }) - await waitJobs([ server ], true) + await waitJobs([ server ], { skipDelayed: true }) const video = await server.videos.get({ id: uuid }) expectStartWith(video.files[0].fileUrl, ObjectStorageCommand.getMockWebTorrentBaseUrl()) diff --git a/server/tests/api/server/proxy.ts b/server/tests/api/server/proxy.ts index 3700b0746..71c444efd 100644 --- a/server/tests/api/server/proxy.ts +++ b/server/tests/api/server/proxy.ts @@ -149,7 +149,7 @@ describe('Test proxy', function () { await servers[0].run(ObjectStorageCommand.getDefaultMockConfig(), { env: badEnv }) const { uuid } = await servers[0].videos.quickUpload({ name: 'video' }) - await waitJobs(servers) + await waitJobs(servers, { skipDelayed: true }) const video = await servers[0].videos.get({ id: uuid }) diff --git a/shared/server-commands/server/jobs.ts b/shared/server-commands/server/jobs.ts index fc65a873b..e1d6cdff4 100644 --- a/shared/server-commands/server/jobs.ts +++ b/shared/server-commands/server/jobs.ts @@ -4,7 +4,14 @@ import { wait } from '@shared/core-utils' import { JobState, JobType } from '../../models' import { PeerTubeServer } from './server' -async function waitJobs (serversArg: PeerTubeServer[] | PeerTubeServer, skipDelayed = false) { +async function waitJobs ( + serversArg: PeerTubeServer[] | PeerTubeServer, + options: { + skipDelayed?: boolean // default false + } = {} +) { + const { skipDelayed = false } = options + const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10) : 250 -- 2.41.0