Remove HLS torrents

This commit is contained in:
Chocobozzz
2020-01-24 16:48:05 +01:00
parent b40eed8b09
commit ffc65cbd2a
6 changed files with 43 additions and 16 deletions

View File

@@ -318,7 +318,7 @@ describe('Test videos redundancy', function () {
await check1WebSeed()
await check0PlaylistRedundancies()
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos', join('playlists', 'hls') ])
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos', join('playlists', 'hls') ])
})
after(async function () {
@@ -368,7 +368,7 @@ describe('Test videos redundancy', function () {
await check1WebSeed()
await check0PlaylistRedundancies()
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ])
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ 'videos' ])
})
after(async function () {
@@ -437,7 +437,7 @@ describe('Test videos redundancy', function () {
await waitJobs(servers)
for (const server of servers) {
await checkVideoFilesWereRemoved(video1Server2UUID, server.serverNumber)
await checkVideoFilesWereRemoved(video1Server2UUID, server.internalServerNumber)
}
})
@@ -572,7 +572,7 @@ describe('Test videos redundancy', function () {
await waitJobs(servers)
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ join('redundancy', 'hls') ])
await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].internalServerNumber, [ join('redundancy', 'hls') ])
})
after(async function () {

View File

@@ -15,7 +15,6 @@ import {
createUser,
dateIsValid,
doubleFollow,
flushAndRunServer,
flushAndRunMultipleServers,
getLocalVideos,
getVideo,
@@ -697,8 +696,8 @@ describe('Test multiple servers', function () {
it('Should not have files of videos 3 and 3-2 on each server', async function () {
for (const server of servers) {
await checkVideoFilesWereRemoved(toRemove[0].uuid, server.serverNumber)
await checkVideoFilesWereRemoved(toRemove[1].uuid, server.serverNumber)
await checkVideoFilesWereRemoved(toRemove[0].uuid, server.internalServerNumber)
await checkVideoFilesWereRemoved(toRemove[1].uuid, server.internalServerNumber)
}
})