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

Try to fix live test

pull/3382/head
Chocobozzz 2020-11-26 15:16:30 +01:00
parent 7fd03a2c8f
commit 0e856b78e9
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/tests/api/live/live.ts
View File

@ -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 ]) {

5
shared/extra-utils/videos/live.ts
View File

@ -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