]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Update travis ffmpeg patch version
authorChocobozzz <me@florianbigard.com>
Fri, 17 May 2019 13:51:42 +0000 (15:51 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 17 May 2019 14:50:52 +0000 (16:50 +0200)
.travis.yml
server/tests/api/videos/multiple-servers.ts
server/tests/api/videos/services.ts
server/tests/api/videos/video-hls.ts
server/tests/fixtures/preview.jpg
server/tests/fixtures/video_short1-preview.webm.jpg

index 5fa41fb43b16eab8adc0fcedbd2c717b16f28fb4..8b3ec94d9725a42a8ca0aab3b01fe5f56f42c38a 100644 (file)
@@ -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
index 09b46120054dbe7669caf280eb6ba29f4c84a98e..e9625e5f79a04589e14641a014e85c0b5cb3f3aa 100644 (file)
@@ -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,
index 38e232e5f4472f61d36e416e58975b40a6b2139d..17172331f917b41639ef298c3bac60bb424554a2 100644 (file)
@@ -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 () {
index eacd9ab79a969e279e1a156b26ee702c129baf88..39178bb1a739b5001ef184708065067ad5c35d95 100644 (file)
@@ -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)
 
index c40ece838e9679508f7d1c8e03585ba2ff05dc6b..cb56922814c88d442797b28db802f314e1cf8dc1 100644 (file)
Binary files a/server/tests/fixtures/preview.jpg and b/server/tests/fixtures/preview.jpg differ
index d2a068b783d96938a57035267e1801c9956d11eb..157d3ca9a9142e32cc51b6f85702c217eeba3089 100644 (file)
Binary files a/server/tests/fixtures/video_short1-preview.webm.jpg and b/server/tests/fixtures/video_short1-preview.webm.jpg differ