From: Chocobozzz <me@florianbigard.com>
Date: Fri, 17 May 2019 13:51:42 +0000 (+0200)
Subject: Update travis ffmpeg patch version
X-Git-Tag: v1.4.0-rc.1~233^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80b8ad2a7084c206efb194ddfbea13df860f0c5f;p=oweals%2Fpeertube.git

Update travis ffmpeg patch version
---

diff --git a/.travis.yml b/.travis.yml
index 5fa41fb43..8b3ec94d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,8 @@ install:
   - CC=gcc-4.9 CXX=g++-4.9 yarn install
 
 before_script:
-  - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.2-64bit-static.tar.xz"
-  - tar xf ffmpeg-release-4.0.2-64bit-static.tar.xz
+  - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.3-64bit-static.tar.xz"
+  - tar xf ffmpeg-release-4.0.3-64bit-static.tar.xz
   - mkdir -p $HOME/bin
   - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin
   - export PATH=$HOME/bin:$PATH
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 09b461200..e9625e5f7 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -215,7 +215,7 @@ describe('Test multiple servers', function () {
           files: [
             {
               resolution: 240,
-              size: 187000
+              size: 189000
             },
             {
               resolution: 360,
@@ -223,7 +223,7 @@ describe('Test multiple servers', function () {
             },
             {
               resolution: 480,
-              size: 383000
+              size: 384000
             },
             {
               resolution: 720,
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts
index 38e232e5f..17172331f 100644
--- a/server/tests/api/videos/services.ts
+++ b/server/tests/api/videos/services.ts
@@ -41,8 +41,8 @@ describe('Test services', function () {
     expect(res.body.width).to.equal(560)
     expect(res.body.height).to.equal(315)
     expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl)
-    expect(res.body.thumbnail_width).to.equal(560)
-    expect(res.body.thumbnail_height).to.equal(315)
+    expect(res.body.thumbnail_width).to.equal(850)
+    expect(res.body.thumbnail_height).to.equal(480)
   })
 
   it('Should have a valid oEmbed response with small max height query', async function () {
diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts
index eacd9ab79..39178bb1a 100644
--- a/server/tests/api/videos/video-hls.ts
+++ b/server/tests/api/videos/video-hls.ts
@@ -114,6 +114,8 @@ describe('Test HLS videos', function () {
   })
 
   it('Should update the video', async function () {
+    this.timeout(10000)
+
     await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { name: 'video 1 updated' })
 
     await waitJobs(servers)
@@ -122,6 +124,8 @@ describe('Test HLS videos', function () {
   })
 
   it('Should delete videos', async function () {
+    this.timeout(10000)
+
     await removeVideo(servers[0].url, servers[0].accessToken, videoUUID)
     await removeVideo(servers[0].url, servers[0].accessToken, videoAudioUUID)
 
diff --git a/server/tests/fixtures/preview.jpg b/server/tests/fixtures/preview.jpg
index c40ece838..cb5692281 100644
Binary files a/server/tests/fixtures/preview.jpg and b/server/tests/fixtures/preview.jpg differ
diff --git a/server/tests/fixtures/video_short1-preview.webm.jpg b/server/tests/fixtures/video_short1-preview.webm.jpg
index d2a068b78..157d3ca9a 100644
Binary files a/server/tests/fixtures/video_short1-preview.webm.jpg and b/server/tests/fixtures/video_short1-preview.webm.jpg differ