From 5170f492b95dc81b75230312411c5fdb0019eed2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 May 2023 09:28:42 +0200 Subject: Try to have more robust live tests --- server/tests/api/transcoding/create-transcoding.ts | 2 +- server/tests/shared/live.ts | 3 ++- server/tests/shared/streaming-playlists.ts | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/transcoding/create-transcoding.ts b/server/tests/api/transcoding/create-transcoding.ts index 85389a949..5483c8dba 100644 --- a/server/tests/api/transcoding/create-transcoding.ts +++ b/server/tests/api/transcoding/create-transcoding.ts @@ -226,7 +226,7 @@ function runTests (objectStorage: boolean) { const resolutions = hlsPlaylist.files.map(f => f.resolution.id) await checkResolutionsInMasterPlaylist({ server: servers[0], playlistUrl: hlsPlaylist.playlistUrl, resolutions }) - const shaBody = await servers[0].streamingPlaylists.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url }) + const shaBody = await servers[0].streamingPlaylists.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url, withRetry: true }) expect(Object.keys(shaBody)).to.have.lengthOf(5) } } diff --git a/server/tests/shared/live.ts b/server/tests/shared/live.ts index 31f92ef19..793503311 100644 --- a/server/tests/shared/live.ts +++ b/server/tests/shared/live.ts @@ -115,7 +115,8 @@ async function testLiveVideoResolutions (options: { baseUrlSegment: baseUrl, videoUUID: video.uuid, segmentName, - hlsPlaylist + hlsPlaylist, + withRetry: objectStorage // With object storage, the request may fail because of inconsistent data in S3 }) if (originServer.internalServerNumber === server.internalServerNumber) { diff --git a/server/tests/shared/streaming-playlists.ts b/server/tests/shared/streaming-playlists.ts index acfb2b408..e4f88bc25 100644 --- a/server/tests/shared/streaming-playlists.ts +++ b/server/tests/shared/streaming-playlists.ts @@ -51,12 +51,13 @@ async function checkLiveSegmentHash (options: { videoUUID: string segmentName: string hlsPlaylist: VideoStreamingPlaylist + withRetry?: boolean }) { - const { server, baseUrlSegment, videoUUID, segmentName, hlsPlaylist } = options + const { server, baseUrlSegment, videoUUID, segmentName, hlsPlaylist, withRetry = false } = options const command = server.streamingPlaylists - const segmentBody = await command.getFragmentedSegment({ url: `${baseUrlSegment}/${videoUUID}/${segmentName}` }) - const shaBody = await command.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url }) + const segmentBody = await command.getFragmentedSegment({ url: `${baseUrlSegment}/${videoUUID}/${segmentName}`, withRetry }) + const shaBody = await command.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url, withRetry }) expect(sha256(segmentBody)).to.equal(shaBody[segmentName]) } -- cgit v1.2.3