aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/shared/live.ts10
-rw-r--r--server/tests/shared/streaming-playlists.ts5
2 files changed, 10 insertions, 5 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 @@
3import { expect } from 'chai' 3import { expect } from 'chai'
4import { pathExists, readdir } from 'fs-extra' 4import { pathExists, readdir } from 'fs-extra'
5import { join } from 'path' 5import { join } from 'path'
6import { wait } from '@shared/core-utils'
7import { LiveVideo, VideoStreamingPlaylistType } from '@shared/models' 6import { LiveVideo, VideoStreamingPlaylistType } from '@shared/models'
8import { ObjectStorageCommand, PeerTubeServer } from '@shared/server-commands' 7import { ObjectStorageCommand, PeerTubeServer } from '@shared/server-commands'
9import { checkLiveSegmentHash, checkResolutionsInMasterPlaylist } from './streaming-playlists' 8import { 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 }
diff --git a/server/tests/shared/streaming-playlists.ts b/server/tests/shared/streaming-playlists.ts
index eff34944b..74c25e99c 100644
--- a/server/tests/shared/streaming-playlists.ts
+++ b/server/tests/shared/streaming-playlists.ts
@@ -57,10 +57,11 @@ async function checkResolutionsInMasterPlaylist (options: {
57 playlistUrl: string 57 playlistUrl: string
58 resolutions: number[] 58 resolutions: number[]
59 transcoded?: boolean // default true 59 transcoded?: boolean // default true
60 withRetry?: boolean // default false
60}) { 61}) {
61 const { server, playlistUrl, resolutions, transcoded = true } = options 62 const { server, playlistUrl, resolutions, withRetry = false, transcoded = true } = options
62 63
63 const masterPlaylist = await server.streamingPlaylists.get({ url: playlistUrl }) 64 const masterPlaylist = await server.streamingPlaylists.get({ url: playlistUrl, withRetry })
64 65
65 for (const resolution of resolutions) { 66 for (const resolution of resolutions) {
66 const reg = transcoded 67 const reg = transcoded