5 files changed, 20 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index 5f6814019..75a8a2786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /config/production.yaml
 /config/local*
 /ffmpeg/
+/ffmpeg-4/
 /thumbnails/
 /torrents/
 /videos/
diff --git a/.travis.yml b/.travis.yml
index f9300f7ff..4cf90e818 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,12 +26,11 @@ install:
   - CC=gcc-4.9 CXX=g++-4.9 yarn install
 
 before_script:
-  - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz"
-  - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz
+  - 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
   - mkdir -p $HOME/bin
   - cp ffmpeg-*-64bit-static/{ffmpeg,ffprobe,ffserver} $HOME/bin
   - export PATH=$HOME/bin:$PATH
-  - export NODE_TEST_IMAGE=true
   - psql -c "create user peertube with password 'peertube';" -U postgres
 
 matrix:
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 25c87b4dc..b91cb75c2 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -66,7 +66,7 @@ describe('Test follows', function () {
   })
 
   it('Should have server 1 following server 2 and 3', async function () {
-    this.timeout(10000)
+    this.timeout(30000)
 
     await follow(servers[0].url, [ servers[1].url, servers[2].url ], servers[0].accessToken)
 
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 516dc5aba..58381a0e5 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -209,19 +209,19 @@ describe('Test multiple servers', function () {
           files: [
             {
               resolution: 240,
-              size: 280000
+              size: 342000
             },
             {
               resolution: 360,
-              size: 370000
+              size: 433000
             },
             {
               resolution: 480,
-              size: 470000
+              size: 538000
             },
             {
               resolution: 720,
-              size: 740000
+              size: 861000
             }
           ],
           thumbnailfile: 'thumbnail',
diff --git a/server/tests/utils/miscs/miscs.ts b/server/tests/utils/miscs/miscs.ts
index 5e46004a7..b0667491b 100644
--- a/server/tests/utils/miscs/miscs.ts
+++ b/server/tests/utils/miscs/miscs.ts
@@ -37,25 +37,18 @@ function root () {
 }
 
 async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
-  // Don't test images if the node env is not set
-  // Because we need a special ffmpeg version for this test
-  if (process.env[ 'NODE_TEST_IMAGE' ]) {
-    const res = await request(url)
-      .get(imagePath)
-      .expect(200)
-
-    const body = res.body
-
-    const data = await readFileBufferPromise(join(__dirname, '..', '..', 'fixtures', imageName + extension))
-    const minLength = body.length - ((20 * body.length) / 100)
-    const maxLength = body.length + ((20 * body.length) / 100)
-
-    expect(data.length).to.be.above(minLength)
-    expect(data.length).to.be.below(maxLength)
-  } else {
-    console.log('Do not test images. Enable it by setting NODE_TEST_IMAGE env variable.')
-    return true
-  }
+  const res = await request(url)
+    .get(imagePath)
+    .expect(200)
+
+  const body = res.body
+
+  const data = await readFileBufferPromise(join(__dirname, '..', '..', 'fixtures', imageName + extension))
+  const minLength = body.length - ((20 * body.length) / 100)
+  const maxLength = body.length + ((20 * body.length) / 100)
+
+  expect(data.length).to.be.above(minLength)
+  expect(data.length).to.be.below(maxLength)
 }
 
 function buildAbsoluteFixturePath (path: string) {