diff options
author | Chocobozzz <me@florianbigard.com> | 2022-10-11 14:20:19 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-10-11 14:33:42 +0200 |
commit | 8bd6aa0424a034166a6b1a63fe4660140246bbb2 (patch) | |
tree | 62a8253a5e1311478befffea74ff4ccfd90b90a2 /server/tests/shared/live.ts | |
parent | 080f14025ea5113d27b9732e06a1db7eb5489dea (diff) | |
download | PeerTube-8bd6aa0424a034166a6b1a63fe4660140246bbb2.tar.gz PeerTube-8bd6aa0424a034166a6b1a63fe4660140246bbb2.tar.zst PeerTube-8bd6aa0424a034166a6b1a63fe4660140246bbb2.zip |
Also retry when fetching master m3u8 playlist
Diffstat (limited to 'server/tests/shared/live.ts')
-rw-r--r-- | server/tests/shared/live.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/server/tests/shared/live.ts b/server/tests/shared/live.ts index f165832fe..63f3ecfd8 100644 --- a/server/tests/shared/live.ts +++ b/server/tests/shared/live.ts | |||
@@ -3,7 +3,6 @@ | |||
3 | import { expect } from 'chai' | 3 | import { expect } from 'chai' |
4 | import { pathExists, readdir } from 'fs-extra' | 4 | import { pathExists, readdir } from 'fs-extra' |
5 | import { join } from 'path' | 5 | import { join } from 'path' |
6 | import { wait } from '@shared/core-utils' | ||
7 | import { LiveVideo, VideoStreamingPlaylistType } from '@shared/models' | 6 | import { LiveVideo, VideoStreamingPlaylistType } from '@shared/models' |
8 | import { ObjectStorageCommand, PeerTubeServer } from '@shared/server-commands' | 7 | import { ObjectStorageCommand, PeerTubeServer } from '@shared/server-commands' |
9 | import { checkLiveSegmentHash, checkResolutionsInMasterPlaylist } from './streaming-playlists' | 8 | import { checkLiveSegmentHash, checkResolutionsInMasterPlaylist } from './streaming-playlists' |
@@ -42,7 +41,13 @@ async function testVideoResolutions (options: { | |||
42 | expect(hlsPlaylist).to.exist | 41 | expect(hlsPlaylist).to.exist |
43 | expect(hlsPlaylist.files).to.have.lengthOf(0) // Only fragmented mp4 files are displayed | 42 | expect(hlsPlaylist.files).to.have.lengthOf(0) // Only fragmented mp4 files are displayed |
44 | 43 | ||
45 | await checkResolutionsInMasterPlaylist({ server, playlistUrl: hlsPlaylist.playlistUrl, resolutions, transcoded }) | 44 | await checkResolutionsInMasterPlaylist({ |
45 | server, | ||
46 | playlistUrl: hlsPlaylist.playlistUrl, | ||
47 | resolutions, | ||
48 | transcoded, | ||
49 | withRetry: objectStorage | ||
50 | }) | ||
46 | 51 | ||
47 | if (objectStorage) { | 52 | if (objectStorage) { |
48 | expect(hlsPlaylist.playlistUrl).to.contain(ObjectStorageCommand.getPlaylistBaseUrl()) | 53 | expect(hlsPlaylist.playlistUrl).to.contain(ObjectStorageCommand.getPlaylistBaseUrl()) |
@@ -59,7 +64,6 @@ async function testVideoResolutions (options: { | |||
59 | 64 | ||
60 | if (objectStorage) { | 65 | if (objectStorage) { |
61 | await originServer.live.waitUntilSegmentUpload({ playlistNumber: i, segment: segmentNum }) | 66 | await originServer.live.waitUntilSegmentUpload({ playlistNumber: i, segment: segmentNum }) |
62 | await wait(1000) | ||
63 | 67 | ||
64 | expect(hlsPlaylist.segmentsSha256Url).to.contain(ObjectStorageCommand.getPlaylistBaseUrl()) | 68 | expect(hlsPlaylist.segmentsSha256Url).to.contain(ObjectStorageCommand.getPlaylistBaseUrl()) |
65 | } | 69 | } |