From e0783718079c1fcb6554ea20e762cfb0592de5b0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Dec 2020 15:43:01 +0100 Subject: Parse log script can take files as args --- server/tests/api/live/live.ts | 5 +++-- server/tests/api/server/follows.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 6d504f742..6a1f6e759 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts @@ -413,10 +413,10 @@ describe('Test live', function () { await testVideoResolutions(liveVideoId, resolutions) await stopFfmpeg(command) - await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) - await waitJobs(servers) + await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId) + const bitrateLimits = { 720: 5000 * 1000, // 60FPS 360: 1100 * 1000, @@ -427,6 +427,7 @@ describe('Test live', function () { const resVideo = await getVideo(server.url, liveVideoId) const video: VideoDetails = resVideo.body + expect(video.state.id).to.equal(VideoState.PUBLISHED) expect(video.duration).to.be.greaterThan(1) expect(video.files).to.have.lengthOf(0) diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index 9233a210b..6467238cd 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts @@ -302,7 +302,7 @@ describe('Test follows', function () { }) it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () { - this.timeout(35000) + this.timeout(60000) await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' }) await uploadVideo(servers[2].url, servers[2].accessToken, { name: 'server3' }) -- cgit v1.2.3