diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/videos/video-hls.ts | 2 | ||||
-rw-r--r-- | server/tests/cli/create-import-video-file-job.ts | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts index db551dd9e..03ac3f321 100644 --- a/server/tests/api/videos/video-hls.ts +++ b/server/tests/api/videos/video-hls.ts | |||
@@ -52,7 +52,7 @@ async function checkHlsPlaylist (servers: ServerInfo[], videoUUID: string, hlsOn | |||
52 | expect(file).to.not.be.undefined | 52 | expect(file).to.not.be.undefined |
53 | 53 | ||
54 | expect(file.magnetUri).to.have.lengthOf.above(2) | 54 | expect(file.magnetUri).to.have.lengthOf.above(2) |
55 | expect(file.torrentUrl).to.equal(`${baseUrl}/static/torrents/${videoDetails.uuid}-${file.resolution.id}-hls.torrent`) | 55 | expect(file.torrentUrl).to.equal(`http://${server.host}/lazy-static/torrents/${videoDetails.uuid}-${file.resolution.id}-hls.torrent`) |
56 | expect(file.fileUrl).to.equal( | 56 | expect(file.fileUrl).to.equal( |
57 | `${baseUrl}/static/streaming-playlists/hls/${videoDetails.uuid}/${videoDetails.uuid}-${file.resolution.id}-fragmented.mp4` | 57 | `${baseUrl}/static/streaming-playlists/hls/${videoDetails.uuid}/${videoDetails.uuid}-${file.resolution.id}-fragmented.mp4` |
58 | ) | 58 | ) |
diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts index dac049fe4..7eaf2c19e 100644 --- a/server/tests/cli/create-import-video-file-job.ts +++ b/server/tests/cli/create-import-video-file-job.ts | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { VideoDetails } from '../../../shared/models/videos' | 5 | import { VideoFile } from '@shared/models/videos/video-file.model' |
6 | import { | 6 | import { |
7 | cleanupTests, | 7 | cleanupTests, |
8 | doubleFollow, | 8 | doubleFollow, |
@@ -16,7 +16,7 @@ import { | |||
16 | uploadVideo | 16 | uploadVideo |
17 | } from '../../../shared/extra-utils' | 17 | } from '../../../shared/extra-utils' |
18 | import { waitJobs } from '../../../shared/extra-utils/server/jobs' | 18 | import { waitJobs } from '../../../shared/extra-utils/server/jobs' |
19 | import { VideoFile } from '@shared/models/videos/video-file.model' | 19 | import { VideoDetails } from '../../../shared/models/videos' |
20 | 20 | ||
21 | const expect = chai.expect | 21 | const expect = chai.expect |
22 | 22 | ||
@@ -62,7 +62,6 @@ describe('Test create import video jobs', function () { | |||
62 | 62 | ||
63 | await waitJobs(servers) | 63 | await waitJobs(servers) |
64 | 64 | ||
65 | let magnetUri: string | ||
66 | for (const server of servers) { | 65 | for (const server of servers) { |
67 | const { data: videos } = (await getVideosList(server.url)).body | 66 | const { data: videos } = (await getVideosList(server.url)).body |
68 | expect(videos).to.have.lengthOf(2) | 67 | expect(videos).to.have.lengthOf(2) |
@@ -74,9 +73,6 @@ describe('Test create import video jobs', function () { | |||
74 | const [ originalVideo, transcodedVideo ] = videoDetail.files | 73 | const [ originalVideo, transcodedVideo ] = videoDetail.files |
75 | assertVideoProperties(originalVideo, 720, 'webm', 218910) | 74 | assertVideoProperties(originalVideo, 720, 'webm', 218910) |
76 | assertVideoProperties(transcodedVideo, 480, 'webm', 69217) | 75 | assertVideoProperties(transcodedVideo, 480, 'webm', 69217) |
77 | |||
78 | if (!magnetUri) magnetUri = transcodedVideo.magnetUri | ||
79 | else expect(transcodedVideo.magnetUri).to.equal(magnetUri) | ||
80 | } | 76 | } |
81 | }) | 77 | }) |
82 | 78 | ||
@@ -86,7 +82,6 @@ describe('Test create import video jobs', function () { | |||
86 | 82 | ||
87 | await waitJobs(servers) | 83 | await waitJobs(servers) |
88 | 84 | ||
89 | let magnetUri: string | ||
90 | for (const server of servers) { | 85 | for (const server of servers) { |
91 | const { data: videos } = (await getVideosList(server.url)).body | 86 | const { data: videos } = (await getVideosList(server.url)).body |
92 | expect(videos).to.have.lengthOf(2) | 87 | expect(videos).to.have.lengthOf(2) |
@@ -100,9 +95,6 @@ describe('Test create import video jobs', function () { | |||
100 | assertVideoProperties(transcodedVideo420, 480, 'mp4') | 95 | assertVideoProperties(transcodedVideo420, 480, 'mp4') |
101 | assertVideoProperties(transcodedVideo320, 360, 'mp4') | 96 | assertVideoProperties(transcodedVideo320, 360, 'mp4') |
102 | assertVideoProperties(transcodedVideo240, 240, 'mp4') | 97 | assertVideoProperties(transcodedVideo240, 240, 'mp4') |
103 | |||
104 | if (!magnetUri) magnetUri = originalVideo.magnetUri | ||
105 | else expect(originalVideo.magnetUri).to.equal(magnetUri) | ||
106 | } | 98 | } |
107 | }) | 99 | }) |
108 | 100 | ||
@@ -112,7 +104,6 @@ describe('Test create import video jobs', function () { | |||
112 | 104 | ||
113 | await waitJobs(servers) | 105 | await waitJobs(servers) |
114 | 106 | ||
115 | let magnetUri: string | ||
116 | for (const server of servers) { | 107 | for (const server of servers) { |
117 | const { data: videos } = (await getVideosList(server.url)).body | 108 | const { data: videos } = (await getVideosList(server.url)).body |
118 | expect(videos).to.have.lengthOf(2) | 109 | expect(videos).to.have.lengthOf(2) |
@@ -124,9 +115,6 @@ describe('Test create import video jobs', function () { | |||
124 | const [ video720, video480 ] = videoDetail.files | 115 | const [ video720, video480 ] = videoDetail.files |
125 | assertVideoProperties(video720, 720, 'webm', 942961) | 116 | assertVideoProperties(video720, 720, 'webm', 942961) |
126 | assertVideoProperties(video480, 480, 'webm', 69217) | 117 | assertVideoProperties(video480, 480, 'webm', 69217) |
127 | |||
128 | if (!magnetUri) magnetUri = video720.magnetUri | ||
129 | else expect(video720.magnetUri).to.equal(magnetUri) | ||
130 | } | 118 | } |
131 | }) | 119 | }) |
132 | 120 | ||