From: Chocobozzz <me@florianbigard.com>
Date: Thu, 26 Nov 2020 14:16:30 +0000 (+0100)
Subject: Try to fix live test
X-Git-Tag: v3.0.0-rc.1~213
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0e856b78e9b6aca5e6a48a04af8b747dbc69658f;hp=7fd03a2c8f9d342927db8fcfa84c96e14a7740a2;p=github%2FChocobozzz%2FPeerTube.git

Try to fix live test
---

diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index 4f84882ff..f99e7ad46 100644
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -39,6 +39,7 @@ import {
   viewVideo,
   wait,
   waitJobs,
+  waitUntilLiveEnded,
   waitUntilLivePublished,
   waitUntilLiveStarts,
   waitUntilLog
@@ -587,6 +588,8 @@ describe('Test live', function () {
       }
 
       await stopFfmpeg(command)
+      await waitUntilLiveEnded(servers[0].url, servers[0].accessToken, liveVideoUUID)
+
       await waitJobs(servers)
 
       for (const stateChanges of [ localStateChanges, remoteStateChanges ]) {
diff --git a/shared/extra-utils/videos/live.ts b/shared/extra-utils/videos/live.ts
index 266baaed3..346134969 100644
--- a/shared/extra-utils/videos/live.ts
+++ b/shared/extra-utils/videos/live.ts
@@ -137,6 +137,10 @@ function waitUntilLivePublished (url: string, token: string, videoId: number | s
   return waitWhileLiveState(url, token, videoId, VideoState.PUBLISHED)
 }
 
+function waitUntilLiveEnded (url: string, token: string, videoId: number | string) {
+  return waitWhileLiveState(url, token, videoId, VideoState.LIVE_ENDED)
+}
+
 async function waitWhileLiveState (url: string, token: string, videoId: number | string, state: VideoState) {
   let video: VideoDetails
 
@@ -185,6 +189,7 @@ export {
   checkLiveCleanup,
   stopFfmpeg,
   sendRTMPStreamInVideo,
+  waitUntilLiveEnded,
   waitFfmpegUntilError,
   sendRTMPStream,
   testFfmpegStreamError