diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-23 10:53:16 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-23 10:53:16 +0200 |
commit | 64324ac646b0938e35cd88771492623b640bd0d8 (patch) | |
tree | 7d702cf4f79d5a39edcdf244d961f059d08d2105 /server/tests/api/live/live.ts | |
parent | 2c2befaacaa7063df0d4557b71c187ee168a8eb6 (diff) | |
parent | b6898035bfc5ba60ec54f7e61ff832e5e2ac30eb (diff) | |
download | PeerTube-64324ac646b0938e35cd88771492623b640bd0d8.tar.gz PeerTube-64324ac646b0938e35cd88771492623b640bd0d8.tar.zst PeerTube-64324ac646b0938e35cd88771492623b640bd0d8.zip |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server/tests/api/live/live.ts')
-rw-r--r-- | server/tests/api/live/live.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index b9caf394d..2d47c131b 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -395,7 +395,7 @@ describe('Test live', function () { | |||
395 | for (let i = 0; i < resolutions.length; i++) { | 395 | for (let i = 0; i < resolutions.length; i++) { |
396 | const segmentNum = 3 | 396 | const segmentNum = 3 |
397 | const segmentName = `${i}-00000${segmentNum}.ts` | 397 | const segmentName = `${i}-00000${segmentNum}.ts` |
398 | await commands[0].waitUntilSegmentGeneration({ videoUUID: video.uuid, resolution: i, segment: segmentNum }) | 398 | await commands[0].waitUntilSegmentGeneration({ videoUUID: video.uuid, playlistNumber: i, segment: segmentNum }) |
399 | 399 | ||
400 | const subPlaylist = await servers[0].streamingPlaylists.get({ | 400 | const subPlaylist = await servers[0].streamingPlaylists.get({ |
401 | url: `${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8` | 401 | url: `${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8` |
@@ -628,9 +628,9 @@ describe('Test live', function () { | |||
628 | commands[0].waitUntilPublished({ videoId: liveVideoReplayId }) | 628 | commands[0].waitUntilPublished({ videoId: liveVideoReplayId }) |
629 | ]) | 629 | ]) |
630 | 630 | ||
631 | await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoId, resolution: 0, segment: 2 }) | 631 | await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoId, playlistNumber: 0, segment: 2 }) |
632 | await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoReplayId, resolution: 0, segment: 2 }) | 632 | await commands[0].waitUntilSegmentGeneration({ videoUUID: liveVideoReplayId, playlistNumber: 0, segment: 2 }) |
633 | await commands[0].waitUntilSegmentGeneration({ videoUUID: permanentLiveVideoReplayId, resolution: 0, segment: 2 }) | 633 | await commands[0].waitUntilSegmentGeneration({ videoUUID: permanentLiveVideoReplayId, playlistNumber: 0, segment: 2 }) |
634 | 634 | ||
635 | { | 635 | { |
636 | const video = await servers[0].videos.get({ id: permanentLiveVideoReplayId }) | 636 | const video = await servers[0].videos.get({ id: permanentLiveVideoReplayId }) |