Browse Source

Update travis ffmpeg patch version

Chocobozzz 5 years ago
parent
commit
80b8ad2a70

+ 2 - 2
.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

+ 2 - 2
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,

+ 2 - 2
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 () {

+ 4 - 0
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)
 

BIN
server/tests/fixtures/preview.jpg


BIN
server/tests/fixtures/video_short1-preview.webm.jpg