aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-02-01 11:18:50 +0100
committerChocobozzz <me@florianbigard.com>2021-02-01 11:23:12 +0100
commit7448551fe5c111fcc7b7448ad864fb15a5c8d87f (patch)
tree47725af0db72dd75a69fbf765444254969ee7ac7 /server/tests
parent33c7131be5883d1b25c49adbcf5750b63905a368 (diff)
downloadPeerTube-7448551fe5c111fcc7b7448ad864fb15a5c8d87f.tar.gz
PeerTube-7448551fe5c111fcc7b7448ad864fb15a5c8d87f.tar.zst
PeerTube-7448551fe5c111fcc7b7448ad864fb15a5c8d87f.zip
Fix redundancy with HLS only files
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/redundancy/redundancy.ts90
1 files changed, 77 insertions, 13 deletions
diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts
index 7cfcf70e1..8da0ba72a 100644
--- a/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@ -21,6 +21,8 @@ import {
21 ServerInfo, 21 ServerInfo,
22 setAccessTokensToServers, 22 setAccessTokensToServers,
23 unfollow, 23 unfollow,
24 updateCustomConfig,
25 updateCustomSubConfig,
24 uploadVideo, 26 uploadVideo,
25 viewVideo, 27 viewVideo,
26 wait, 28 wait,
@@ -60,7 +62,7 @@ function checkMagnetWebseeds (file: { magnetUri: string, resolution: { id: numbe
60 expect(parsed.urlList).to.have.lengthOf(baseWebseeds.length) 62 expect(parsed.urlList).to.have.lengthOf(baseWebseeds.length)
61} 63}
62 64
63async function flushAndRunServers (strategy: VideoRedundancyStrategy | null, additionalParams: any = {}) { 65async function flushAndRunServers (strategy: VideoRedundancyStrategy | null, additionalParams: any = {}, withWebtorrent = true) {
64 const strategies: any[] = [] 66 const strategies: any[] = []
65 67
66 if (strategy !== null) { 68 if (strategy !== null) {
@@ -75,6 +77,9 @@ async function flushAndRunServers (strategy: VideoRedundancyStrategy | null, add
75 77
76 const config = { 78 const config = {
77 transcoding: { 79 transcoding: {
80 webtorrent: {
81 enabled: withWebtorrent
82 },
78 hls: { 83 hls: {
79 enabled: true 84 enabled: true
80 } 85 }
@@ -253,7 +258,7 @@ async function checkStatsGlobal (strategy: VideoRedundancyStrategyWithManual) {
253 return stat 258 return stat
254} 259}
255 260
256async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategyWithManual) { 261async function checkStatsWith1Redundancy (strategy: VideoRedundancyStrategyWithManual) {
257 const stat = await checkStatsGlobal(strategy) 262 const stat = await checkStatsGlobal(strategy)
258 263
259 expect(stat.totalUsed).to.be.at.least(1).and.below(409601) 264 expect(stat.totalUsed).to.be.at.least(1).and.below(409601)
@@ -261,7 +266,7 @@ async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategyWithManu
261 expect(stat.totalVideos).to.equal(1) 266 expect(stat.totalVideos).to.equal(1)
262} 267}
263 268
264async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategyWithManual) { 269async function checkStatsWithoutRedundancy (strategy: VideoRedundancyStrategyWithManual) {
265 const stat = await checkStatsGlobal(strategy) 270 const stat = await checkStatsGlobal(strategy)
266 271
267 expect(stat.totalUsed).to.equal(0) 272 expect(stat.totalUsed).to.equal(0)
@@ -313,7 +318,7 @@ describe('Test videos redundancy', function () {
313 it('Should have 1 webseed on the first video', async function () { 318 it('Should have 1 webseed on the first video', async function () {
314 await check1WebSeed() 319 await check1WebSeed()
315 await check0PlaylistRedundancies() 320 await check0PlaylistRedundancies()
316 await checkStatsWith1Webseed(strategy) 321 await checkStatsWithoutRedundancy(strategy)
317 }) 322 })
318 323
319 it('Should enable redundancy on server 1', function () { 324 it('Should enable redundancy on server 1', function () {
@@ -329,7 +334,7 @@ describe('Test videos redundancy', function () {
329 334
330 await check2Webseeds() 335 await check2Webseeds()
331 await check1PlaylistRedundancies() 336 await check1PlaylistRedundancies()
332 await checkStatsWith2Webseed(strategy) 337 await checkStatsWith1Redundancy(strategy)
333 }) 338 })
334 339
335 it('Should undo redundancy on server 1 and remove duplicated videos', async function () { 340 it('Should undo redundancy on server 1 and remove duplicated videos', async function () {
@@ -363,7 +368,7 @@ describe('Test videos redundancy', function () {
363 it('Should have 1 webseed on the first video', async function () { 368 it('Should have 1 webseed on the first video', async function () {
364 await check1WebSeed() 369 await check1WebSeed()
365 await check0PlaylistRedundancies() 370 await check0PlaylistRedundancies()
366 await checkStatsWith1Webseed(strategy) 371 await checkStatsWithoutRedundancy(strategy)
367 }) 372 })
368 373
369 it('Should enable redundancy on server 1', function () { 374 it('Should enable redundancy on server 1', function () {
@@ -379,7 +384,7 @@ describe('Test videos redundancy', function () {
379 384
380 await check2Webseeds() 385 await check2Webseeds()
381 await check1PlaylistRedundancies() 386 await check1PlaylistRedundancies()
382 await checkStatsWith2Webseed(strategy) 387 await checkStatsWith1Redundancy(strategy)
383 }) 388 })
384 389
385 it('Should unfollow on server 1 and remove duplicated videos', async function () { 390 it('Should unfollow on server 1 and remove duplicated videos', async function () {
@@ -413,7 +418,7 @@ describe('Test videos redundancy', function () {
413 it('Should have 1 webseed on the first video', async function () { 418 it('Should have 1 webseed on the first video', async function () {
414 await check1WebSeed() 419 await check1WebSeed()
415 await check0PlaylistRedundancies() 420 await check0PlaylistRedundancies()
416 await checkStatsWith1Webseed(strategy) 421 await checkStatsWithoutRedundancy(strategy)
417 }) 422 })
418 423
419 it('Should enable redundancy on server 1', function () { 424 it('Should enable redundancy on server 1', function () {
@@ -429,7 +434,7 @@ describe('Test videos redundancy', function () {
429 434
430 await check1WebSeed() 435 await check1WebSeed()
431 await check0PlaylistRedundancies() 436 await check0PlaylistRedundancies()
432 await checkStatsWith1Webseed(strategy) 437 await checkStatsWithoutRedundancy(strategy)
433 }) 438 })
434 439
435 it('Should view 2 times the first video to have > min_views config', async function () { 440 it('Should view 2 times the first video to have > min_views config', async function () {
@@ -451,7 +456,7 @@ describe('Test videos redundancy', function () {
451 456
452 await check2Webseeds() 457 await check2Webseeds()
453 await check1PlaylistRedundancies() 458 await check1PlaylistRedundancies()
454 await checkStatsWith2Webseed(strategy) 459 await checkStatsWith1Redundancy(strategy)
455 }) 460 })
456 461
457 it('Should remove the video and the redundancy files', async function () { 462 it('Should remove the video and the redundancy files', async function () {
@@ -471,6 +476,65 @@ describe('Test videos redundancy', function () {
471 }) 476 })
472 }) 477 })
473 478
479 describe('With only HLS files', function () {
480 const strategy = 'recently-added'
481
482 before(async function () {
483 this.timeout(120000)
484
485 await flushAndRunServers(strategy, { min_views: 3 }, false)
486 })
487
488 it('Should have 0 playlist redundancy on the first video', async function () {
489 await check1WebSeed()
490 await check0PlaylistRedundancies()
491 })
492
493 it('Should enable redundancy on server 1', function () {
494 return enableRedundancyOnServer1()
495 })
496
497 it('Should still have 0 redundancy on the first video', async function () {
498 this.timeout(80000)
499
500 await waitJobs(servers)
501 await wait(15000)
502 await waitJobs(servers)
503
504 await check0PlaylistRedundancies()
505 await checkStatsWithoutRedundancy(strategy)
506 })
507
508 it('Should have 1 redundancy on the first video', async function () {
509 this.timeout(160000)
510
511 await viewVideo(servers[0].url, video1Server2UUID)
512 await viewVideo(servers[2].url, video1Server2UUID)
513
514 await wait(10000)
515 await waitJobs(servers)
516
517 await waitJobs(servers)
518 await waitUntilLog(servers[0], 'Duplicated ', 1)
519 await waitJobs(servers)
520
521 await check1PlaylistRedundancies()
522 await checkStatsWith1Redundancy(strategy)
523 })
524
525 it('Should remove the video and the redundancy files', async function () {
526 this.timeout(20000)
527
528 await removeVideo(servers[1].url, servers[1].accessToken, video1Server2UUID)
529
530 await waitJobs(servers)
531
532 for (const server of servers) {
533 await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
534 }
535 })
536 })
537
474 describe('With manual strategy', function () { 538 describe('With manual strategy', function () {
475 before(function () { 539 before(function () {
476 this.timeout(120000) 540 this.timeout(120000)
@@ -481,7 +545,7 @@ describe('Test videos redundancy', function () {
481 it('Should have 1 webseed on the first video', async function () { 545 it('Should have 1 webseed on the first video', async function () {
482 await check1WebSeed() 546 await check1WebSeed()
483 await check0PlaylistRedundancies() 547 await check0PlaylistRedundancies()
484 await checkStatsWith1Webseed('manual') 548 await checkStatsWithoutRedundancy('manual')
485 }) 549 })
486 550
487 it('Should create a redundancy on first video', async function () { 551 it('Should create a redundancy on first video', async function () {
@@ -501,7 +565,7 @@ describe('Test videos redundancy', function () {
501 565
502 await check2Webseeds() 566 await check2Webseeds()
503 await check1PlaylistRedundancies() 567 await check1PlaylistRedundancies()
504 await checkStatsWith2Webseed('manual') 568 await checkStatsWith1Redundancy('manual')
505 }) 569 })
506 570
507 it('Should manually remove redundancies on server 1 and remove duplicated videos', async function () { 571 it('Should manually remove redundancies on server 1 and remove duplicated videos', async function () {
@@ -619,7 +683,7 @@ describe('Test videos redundancy', function () {
619 683
620 await check2Webseeds() 684 await check2Webseeds()
621 await check1PlaylistRedundancies() 685 await check1PlaylistRedundancies()
622 await checkStatsWith2Webseed(strategy) 686 await checkStatsWith1Redundancy(strategy)
623 687
624 const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2' }) 688 const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 2 server 2' })
625 video2Server2UUID = res.body.video.uuid 689 video2Server2UUID = res.body.video.uuid