diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-11-17 16:14:11 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-11-17 16:14:11 +0100 |
| commit | 3e8584b99ae03ab4d87db0fe70c49c3744e8d762 (patch) | |
| tree | e2807d18fe2325ddae2ed02a32ee45e6eb07f3f7 | |
| parent | de29e90c373c12a32bbce7b75d2017affc3ee16e (diff) | |
| download | PeerTube-3e8584b99ae03ab4d87db0fe70c49c3744e8d762.tar.gz PeerTube-3e8584b99ae03ab4d87db0fe70c49c3744e8d762.tar.zst PeerTube-3e8584b99ae03ab4d87db0fe70c49c3744e8d762.zip | |
Fix live tests
| -rw-r--r-- | server/tests/api/live/live.ts | 2 | ||||
| -rw-r--r-- | shared/extra-utils/server/servers.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 94c966c9f..98a5287aa 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
| @@ -324,7 +324,7 @@ describe('Test live', function () { | |||
| 324 | 324 | ||
| 325 | for (let i = 0; i < resolutions.length; i++) { | 325 | for (let i = 0; i < resolutions.length; i++) { |
| 326 | const segmentName = `${i}-000001.ts` | 326 | const segmentName = `${i}-000001.ts` |
| 327 | await waitUntilLog(servers[0], `${video.uuid}/${segmentName}`, 1, false) | 327 | await waitUntilLog(servers[0], `${video.uuid}/${segmentName}`, 2, false) |
| 328 | 328 | ||
| 329 | const res = await getPlaylist(`${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8`) | 329 | const res = await getPlaylist(`${servers[0].url}/static/streaming-playlists/hls/${video.uuid}/${i}.m3u8`) |
| 330 | const subPlaylist = res.text | 330 | const subPlaylist = res.text |
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index e26a6937c..6140cebb5 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts | |||
| @@ -108,7 +108,7 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object, | |||
| 108 | const parallel = parallelTests() | 108 | const parallel = parallelTests() |
| 109 | 109 | ||
| 110 | const internalServerNumber = parallel ? randomServer() : serverNumber | 110 | const internalServerNumber = parallel ? randomServer() : serverNumber |
| 111 | const rtmpPort = parallel ? randomRTMP() : null | 111 | const rtmpPort = parallel ? randomRTMP() : 1936 |
| 112 | const port = 9000 + internalServerNumber | 112 | const port = 9000 + internalServerNumber |
| 113 | 113 | ||
| 114 | await flushTests(internalServerNumber) | 114 | await flushTests(internalServerNumber) |