aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-12-10 15:43:01 +0100
committerChocobozzz <chocobozzz@cpy.re>2020-12-14 09:11:27 +0100
commite0783718079c1fcb6554ea20e762cfb0592de5b0 (patch)
tree8a13865dde332bd0e5dbe4fa6c5b1ac395237d32 /server
parent0d9c2cc0a2983b678bc839fe95b90cb7781b8149 (diff)
downloadPeerTube-e0783718079c1fcb6554ea20e762cfb0592de5b0.tar.gz
PeerTube-e0783718079c1fcb6554ea20e762cfb0592de5b0.tar.zst
PeerTube-e0783718079c1fcb6554ea20e762cfb0592de5b0.zip
Parse log script can take files as args
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/live/live.ts5
-rw-r--r--server/tests/api/server/follows.ts2
2 files changed, 4 insertions, 3 deletions
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 () {
413 await testVideoResolutions(liveVideoId, resolutions) 413 await testVideoResolutions(liveVideoId, resolutions)
414 414
415 await stopFfmpeg(command) 415 await stopFfmpeg(command)
416 await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId)
417
418 await waitJobs(servers) 416 await waitJobs(servers)
419 417
418 await waitUntilLivePublished(servers[0].url, servers[0].accessToken, liveVideoId)
419
420 const bitrateLimits = { 420 const bitrateLimits = {
421 720: 5000 * 1000, // 60FPS 421 720: 5000 * 1000, // 60FPS
422 360: 1100 * 1000, 422 360: 1100 * 1000,
@@ -427,6 +427,7 @@ describe('Test live', function () {
427 const resVideo = await getVideo(server.url, liveVideoId) 427 const resVideo = await getVideo(server.url, liveVideoId)
428 const video: VideoDetails = resVideo.body 428 const video: VideoDetails = resVideo.body
429 429
430 expect(video.state.id).to.equal(VideoState.PUBLISHED)
430 expect(video.duration).to.be.greaterThan(1) 431 expect(video.duration).to.be.greaterThan(1)
431 expect(video.files).to.have.lengthOf(0) 432 expect(video.files).to.have.lengthOf(0)
432 433
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 () {
302 }) 302 })
303 303
304 it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () { 304 it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () {
305 this.timeout(35000) 305 this.timeout(60000)
306 306
307 await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' }) 307 await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' })
308 await uploadVideo(servers[2].url, servers[2].accessToken, { name: 'server3' }) 308 await uploadVideo(servers[2].url, servers[2].accessToken, { name: 'server3' })