aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-01-24 16:48:05 +0100
committerChocobozzz <me@florianbigard.com>2020-01-24 16:48:05 +0100
commitffc65cbd2a3d8b0b41243baec9936272592137e3 (patch)
tree1d48a71e08d9213683aa6650d69645c676afeb6a /server/tests
parentb40eed8b09336ce3a64a0cc99a467e487ce0ef94 (diff)
downloadPeerTube-ffc65cbd2a3d8b0b41243baec9936272592137e3.tar.gz
PeerTube-ffc65cbd2a3d8b0b41243baec9936272592137e3.tar.zst
PeerTube-ffc65cbd2a3d8b0b41243baec9936272592137e3.zip
Remove HLS torrents
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/redundancy/redundancy.ts8
-rw-r--r--server/tests/api/videos/multiple-servers.ts5
2 files changed, 6 insertions, 7 deletions
diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts
index be24eb32f..1cdf93aa1 100644
--- a/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@ -318,7 +318,7 @@ describe('Test videos redundancy', function () {
318 await check1WebSeed() 318 await check1WebSeed()
319 await check0PlaylistRedundancies() 319 await check0PlaylistRedundancies()
320 320
321 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos', join('playlists', 'hls') ]) 321 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos', join('playlists', 'hls') ])
322 }) 322 })
323 323
324 after(async function () { 324 after(async function () {
@@ -368,7 +368,7 @@ describe('Test videos redundancy', function () {
368 await check1WebSeed() 368 await check1WebSeed()
369 await check0PlaylistRedundancies() 369 await check0PlaylistRedundancies()
370 370
371 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) 371 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos' ])
372 }) 372 })
373 373
374 after(async function () { 374 after(async function () {
@@ -437,7 +437,7 @@ describe('Test videos redundancy', function () {
437 await waitJobs(servers) 437 await waitJobs(servers)
438 438
439 for (const server of servers) { 439 for (const server of servers) {
440 await checkVideoFilesWereRemoved(video1Server2UUID, server.serverNumber) 440 await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
441 } 441 }
442 }) 442 })
443 443
@@ -572,7 +572,7 @@ describe('Test videos redundancy', function () {
572 572
573 await waitJobs(servers) 573 await waitJobs(servers)
574 574
575 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ join('redundancy', 'hls') ]) 575 await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ join('redundancy', 'hls') ])
576 }) 576 })
577 577
578 after(async function () { 578 after(async function () {
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 22d87b88c..fa3e250ec 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -15,7 +15,6 @@ import {
15 createUser, 15 createUser,
16 dateIsValid, 16 dateIsValid,
17 doubleFollow, 17 doubleFollow,
18 flushAndRunServer,
19 flushAndRunMultipleServers, 18 flushAndRunMultipleServers,
20 getLocalVideos, 19 getLocalVideos,
21 getVideo, 20 getVideo,
@@ -697,8 +696,8 @@ describe('Test multiple servers', function () {
697 696
698 it('Should not have files of videos 3 and 3-2 on each server', async function () { 697 it('Should not have files of videos 3 and 3-2 on each server', async function () {
699 for (const server of servers) { 698 for (const server of servers) {
700 await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber) 699 await checkVideoFilesWereRemoved(toRemove[0].uuid, server.internalServerNumber)
701 await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber) 700 await checkVideoFilesWereRemoved(toRemove[1].uuid, server.internalServerNumber)
702 } 701 }
703 }) 702 })
704 703