X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Flive%2Flive.ts;h=7ea0ec198e4388bd0fd9b726d315c62545218505;hb=0d8de2756fdc43be61a82a96c17d12ee52ba0143;hp=0786db554a3469ce074b58f57c595a43a5c7f3f1;hpb=6b67897e2eab96978daee40aeaf716835856d65d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 0786db554..7ea0ec198 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts @@ -7,6 +7,7 @@ import { join } from 'path' import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils' import { getLiveNotificationSocket } from '@shared/extra-utils/socket/socket-io' import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' import { addVideoToBlacklist, buildServerDirectory, @@ -39,8 +40,9 @@ import { viewVideo, wait, waitJobs, + waitUntilLiveEnded, waitUntilLivePublished, - waitUntilLiveStarts, + waitUntilLiveSegmentGeneration, waitUntilLog } from '../../../../shared/extra-utils' @@ -163,8 +165,8 @@ describe('Test live', function () { expect(video.privacy.id).to.equal(VideoPrivacy.UNLISTED) expect(video.nsfw).to.be.true - await makeRawRequest(server.url + video.thumbnailPath, 200) - await makeRawRequest(server.url + video.previewPath, 200) + await makeRawRequest(server.url + video.thumbnailPath, HttpStatusCode.OK_200) + await makeRawRequest(server.url + video.previewPath, HttpStatusCode.OK_200) } }) @@ -178,7 +180,7 @@ describe('Test live', function () { }) it('Should not be able to update a live of another server', async function () { - await updateLive(servers[1].url, servers[1].accessToken, liveVideoUUID, { saveReplay: false }, 403) + await updateLive(servers[1].url, servers[1].accessToken, liveVideoUUID, { saveReplay: false }, HttpStatusCode.FORBIDDEN_403) }) it('Should update the live', async function () { @@ -214,8 +216,8 @@ describe('Test live', function () { it('Should have the live deleted', async function () { for (const server of servers) { - await getVideo(server.url, liveVideoUUID, 404) - await getLive(server.url, server.accessToken, liveVideoUUID, 404) + await getVideo(server.url, liveVideoUUID, HttpStatusCode.NOT_FOUND_404) + await getLive(server.url, server.accessToken, liveVideoUUID, HttpStatusCode.NOT_FOUND_404) } }) }) @@ -327,8 +329,9 @@ describe('Test live', function () { await checkResolutionsInMasterPlaylist(hlsPlaylist.playlistUrl, resolutions) for (let i = 0; i < resolutions.length; i++) { - const segmentName = `${i}-000001.ts` - await waitUntilLog(servers[0], `${video.uuid}/${segmentName}`, 2, false) + const segmentNum = 1 + const segmentName = `${i}-00000${segmentNum}.ts` + await waitUntilLiveSegmentGeneration(servers[0], video.uuid, i, segmentNum) const res = await getPlaylist(`${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8`) const subPlaylist = res.text @@ -372,7 +375,7 @@ describe('Test live', function () { liveVideoId = await createLiveWrapper(false) const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId) - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoId) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) await waitJobs(servers) await testVideoResolutions(liveVideoId, [ 720 ]) @@ -388,7 +391,7 @@ describe('Test live', function () { liveVideoId = await createLiveWrapper(false) const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId) - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoId) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) await waitJobs(servers) await testVideoResolutions(liveVideoId, resolutions) @@ -405,7 +408,7 @@ describe('Test live', function () { liveVideoId = await createLiveWrapper(true) const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId, 'video_short2.webm') - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoId) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) await waitJobs(servers) await testVideoResolutions(liveVideoId, resolutions) @@ -416,7 +419,7 @@ describe('Test live', function () { await waitJobs(servers) const bitrateLimits = { - 720: 3000 * 1000, + 720: 5000 * 1000, // 60FPS 360: 1100 * 1000, 240: 600 * 1000 } @@ -429,6 +432,8 @@ describe('Test live', function () { expect(video.files).to.have.lengthOf(0) const hlsPlaylist = video.streamingPlaylists.find(s => s.type === VideoStreamingPlaylistType.HLS) + await makeRawRequest(hlsPlaylist.playlistUrl, HttpStatusCode.OK_200) + await makeRawRequest(hlsPlaylist.segmentsSha256Url, HttpStatusCode.OK_200) expect(hlsPlaylist.files).to.have.lengthOf(resolutions.length) @@ -436,9 +441,14 @@ describe('Test live', function () { const file = hlsPlaylist.files.find(f => f.resolution.id === resolution) expect(file).to.exist - expect(file.fps).to.be.approximately(30, 5) expect(file.size).to.be.greaterThan(1) + if (resolution >= 720) { + expect(file.fps).to.be.approximately(60, 2) + } else { + expect(file.fps).to.be.approximately(30, 2) + } + const filename = `${video.uuid}-${resolution}-fragmented.mp4` const segmentPath = buildServerDirectory(servers[0], join('streaming-playlists', 'hls', video.uuid, filename)) @@ -447,8 +457,8 @@ describe('Test live', function () { expect(probe.format.bit_rate).to.be.below(bitrateLimits[videoStream.height]) - await makeRawRequest(file.torrentUrl, 200) - await makeRawRequest(file.fileUrl, 200) + await makeRawRequest(file.torrentUrl, HttpStatusCode.OK_200) + await makeRawRequest(file.fileUrl, HttpStatusCode.OK_200) } } }) @@ -486,7 +496,7 @@ describe('Test live', function () { liveVideoId = res.body.video.uuid command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId) - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoId) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) await waitJobs(servers) }) @@ -573,20 +583,29 @@ describe('Test live', function () { } const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID) - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoUUID) + + for (const server of servers) { + await waitUntilLivePublished(server.url, server.accessToken, liveVideoUUID) + } + await waitJobs(servers) for (const stateChanges of [ localStateChanges, remoteStateChanges ]) { - expect(stateChanges).to.have.lengthOf(1) - expect(stateChanges[0]).to.equal(VideoState.PUBLISHED) + expect(stateChanges).to.have.length.at.least(1) + expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.PUBLISHED) } await stopFfmpeg(command) + + for (const server of servers) { + await waitUntilLiveEnded(server.url, server.accessToken, liveVideoUUID) + } + await waitJobs(servers) for (const stateChanges of [ localStateChanges, remoteStateChanges ]) { - expect(stateChanges).to.have.lengthOf(2) - expect(stateChanges[1]).to.equal(VideoState.LIVE_ENDED) + expect(stateChanges).to.have.length.at.least(2) + expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.LIVE_ENDED) } }) @@ -605,7 +624,7 @@ describe('Test live', function () { socket.emit('subscribe', { videoId }) const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID) - await waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoUUID) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoUUID) await waitJobs(servers) expect(stateChanges).to.have.lengthOf(1) @@ -635,7 +654,7 @@ describe('Test live', function () { } before(async function () { - this.timeout(60000) + this.timeout(120000) liveVideoId = await createLiveWrapper(false) liveVideoReplayId = await createLiveWrapper(true) @@ -646,10 +665,13 @@ describe('Test live', function () { ]) await Promise.all([ - waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoId), - waitUntilLiveStarts(servers[0].url, servers[0].accessToken, liveVideoReplayId) + waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId), + waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoReplayId) ]) + await waitUntilLiveSegmentGeneration(servers[0], liveVideoId, 0, 2) + await waitUntilLiveSegmentGeneration(servers[0], liveVideoReplayId, 0, 2) + await killallServers([ servers[0] ]) await reRunServer(servers[0]) @@ -659,21 +681,13 @@ describe('Test live', function () { it('Should cleanup lives', async function () { this.timeout(60000) - const res = await getVideo(servers[0].url, liveVideoId) - const video: VideoDetails = res.body - - expect(video.state.id).to.equal(VideoState.LIVE_ENDED) + await waitUntilLiveEnded(servers[0].url, servers[0].accessToken, liveVideoId) }) it('Should save a live replay', async function () { - this.timeout(60000) - - await waitJobs(servers) - - const res = await getVideo(servers[0].url, liveVideoReplayId) - const video: VideoDetails = res.body + this.timeout(120000) - expect(video.state.id).to.equal(VideoState.PUBLISHED) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoReplayId) }) })