Fix proxy tests

diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts
index af3db9334d44da616e558f2ef5e1f4da74f1764e..d1875febb941053651677e1fd3483ab25c5893d2 100644 (file)
--- 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 3700b07462052ee940c5fc835e0e538410d6c6a3..71c444efd6a052ea1d3db3cc37fcbef11c500357 100644 (file)
--- 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 fc65a873b10e177cf2c60f07859f32a7c7c43b0d..e1d6cdff4034f031cc58d03db18cba7277c3c0e6 100644 (file)
--- 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