From cb5f0b89598217b5ec3423811f40b343ef9429ca Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 12 Feb 2025 10:33:34 +0100
Subject: [PATCH] Fix tests

---
 packages/server-commands/src/server/jobs.ts               | 5 ++++-
 packages/tests/src/peertube-runner/video-transcription.ts | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/server-commands/src/server/jobs.ts b/packages/server-commands/src/server/jobs.ts
index 10fee95d9..3938c9264 100644
--- a/packages/server-commands/src/server/jobs.ts
+++ b/packages/server-commands/src/server/jobs.ts
@@ -7,10 +7,11 @@ async function waitJobs (
   serversArg: PeerTubeServer[] | PeerTubeServer,
   options: {
     skipDelayed?: boolean // default false
+    skipFailed?: boolean // default false
     runnerJobs?: boolean // default false
   } = {}
 ) {
-  const { skipDelayed = false, runnerJobs = false } = options
+  const { skipDelayed = false, skipFailed = false, runnerJobs = false } = options
 
   const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT
     ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10)
@@ -69,6 +70,8 @@ async function waitJobs (
           .then(({ data }) => {
             for (const job of data) {
               if (job.state.id !== RunnerJobState.COMPLETED) {
+                if (skipFailed && job.state.id === RunnerJobState.ERRORED) continue
+
                 pendingRequests = true
 
                 if (process.env.DEBUG) {
diff --git a/packages/tests/src/peertube-runner/video-transcription.ts b/packages/tests/src/peertube-runner/video-transcription.ts
index d264db0aa..aa106c8d1 100644
--- a/packages/tests/src/peertube-runner/video-transcription.ts
+++ b/packages/tests/src/peertube-runner/video-transcription.ts
@@ -109,7 +109,7 @@ describe('Test transcription in peertube-runner program', function () {
         this.timeout(360000)
 
         const uuid = await uploadForTranscription(servers[0])
-        await waitJobs(servers, { runnerJobs: true })
+        await waitJobs(servers, { runnerJobs: true, skipFailed: true }) // skipFailed because previous test had a failed runner job
 
         await checkAutoCaption({ servers, uuid, objectStorageBaseUrl: objectStorage.getMockCaptionFileBaseUrl() })
         await checkLanguage(servers, uuid, 'en')