From 179bfea5e053c6668bf72f60f0f5f214c27e3172 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 14 Oct 2021 09:36:55 +0200 Subject: Fix import tests --- server/tests/api/videos/video-imports.ts | 6 +++--- shared/extra-utils/miscs/tests.ts | 15 ++++----------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index 2f49bfc56..4686d5800 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -294,11 +294,11 @@ Ajouter un sous-titre est vraiment facile`) transcoding: { enabled: true, resolutions: { - '240p': false, + '240p': true, '360p': false, '480p': false, '720p': false, - '1080p': true, // the resulting resolution shouldn't be higher than this, and not vp9.2/av01 + '1080p': false, // the resulting resolution shouldn't be higher than this, and not vp9.2/av01 '1440p': false, '2160p': false }, @@ -333,7 +333,7 @@ Ajouter un sous-titre est vraiment facile`) const video = await servers[0].videos.get({ id: videoUUID }) expect(video.name).to.equal('hdr video') const maxResolution = Math.max.apply(Math, video.files.map(function (o) { return o.resolution.id })) - expect(maxResolution, 'expected max resolution not met').to.equals(VideoResolution.H_1080P) + expect(maxResolution, 'expected max resolution not met').to.equals(VideoResolution.H_240P) }) it('Should import a peertube video', async function () { diff --git a/shared/extra-utils/miscs/tests.ts b/shared/extra-utils/miscs/tests.ts index 5b5430278..6299a48f5 100644 --- a/shared/extra-utils/miscs/tests.ts +++ b/shared/extra-utils/miscs/tests.ts @@ -10,21 +10,14 @@ const FIXTURE_URLS = { /** * The video is used to check format-selection correctness wrt. HDR, * which brings its own set of oddities outside of a MediaSource. - * FIXME: refactor once HDR is supported at playback * * The video needs to have the following format_ids: * (which you can check by using `youtube-dl -F`): - * - 303 (1080p webm vp9) - * - 299 (1080p mp4 avc1) - * - 335 (1080p webm vp9.2 HDR) - * - * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING - * - 400 (1080p mp4 av01) - * - 315 (2160p webm vp9 HDR) - * - 337 (2160p webm vp9.2 HDR) - * - 401 (2160p mp4 av01 HDR) + * - (webm vp9) + * - (mp4 avc1) + * - (webm vp9.2 HDR) */ - youtubeHDR: 'https://www.youtube.com/watch?v=qR5vOXbZsI4', + youtubeHDR: 'https://www.youtube.com/watch?v=RQgnBB9z_N4', // eslint-disable-next-line max-len magnet: 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4', -- cgit v1.2.3