From 288178bf02984c7e6dc69241918b88234a0dcb91 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 10 Aug 2018 17:49:12 +0200
Subject: Try to fix travis tests

---
 server/tests/api/server/follows.ts          |  2 +-
 server/tests/api/videos/multiple-servers.ts |  8 ++++----
 server/tests/utils/miscs/miscs.ts           | 31 +++++++++++------------------
 3 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'server')

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) {
-- 
cgit v1.2.3