import {
doubleFollow,
flushAndRunMultipleServers,
- flushTests,
getMyVideos,
getVideo,
getVideosList,
ServerInfo,
setAccessTokensToServers,
uploadVideo,
- wait,
webtorrentAdd
} from '../../utils'
import { join } from 'path'
+import { waitJobs } from '../../utils/server/jobs'
const expect = chai.expect
}
await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
- await wait(10000)
+ await waitJobs(servers)
const res = await getVideosList(servers[0].url)
const video = res.body.data[0]
}
await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes)
- await wait(20000)
+ await waitJobs(servers)
const res = await getVideosList(servers[1].url)
expect(torrent.files[0].path).match(/\.mp4$/)
})
- it('Should transcode to 30 FPS', async function () {
+ it('Should transcode a 60 FPS video', async function () {
this.timeout(60000)
const videoAttributes = {
name: 'my super 30fps name for server 2',
description: 'my super 30fps description for server 2',
- fixture: 'video_60fps_short.mp4'
+ fixture: '60fps_720p_small.mp4'
}
await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes)
- await wait(20000)
+ await waitJobs(servers)
const res = await getVideosList(servers[1].url)
const res2 = await getVideo(servers[1].url, video.id)
const videoDetails: VideoDetails = res2.body
- expect(videoDetails.files).to.have.lengthOf(1)
+ expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files[0].fps).to.be.above(58).and.below(62)
+ expect(videoDetails.files[1].fps).to.be.below(31)
+ expect(videoDetails.files[2].fps).to.be.below(31)
+ expect(videoDetails.files[3].fps).to.be.below(31)
- for (const resolution of [ '240' ]) {
+ for (const resolution of [ '240', '360', '480' ]) {
const path = join(root(), 'test2', 'videos', video.uuid + '-' + resolution + '.mp4')
const fps = await getVideoFileFPS(path)
expect(fps).to.be.below(31)
}
+
+ const path = join(root(), 'test2', 'videos', video.uuid + '-720.mp4')
+ const fps = await getVideoFileFPS(path)
+
+ expect(fps).to.be.above(58).and.below(62)
})
it('Should wait transcoding before publishing the video', async function () {
await doubleFollow(servers[0], servers[1])
- await wait(15000)
+ await waitJobs(servers)
{
// Upload the video, but wait transcoding
await getVideo(servers[0].url, videoId, 404)
}
- await wait(30000)
+ await waitJobs(servers)
for (const server of servers) {
const res = await getVideosList(server.url)
after(async function () {
killallServers(servers)
-
- // Keep the logs if the test failed
- if (this['ok']) {
- await flushTests()
- }
})
})