From 365b546c9fbc2a8a7f9c7de7da25209cd83e73d8 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 31 Jul 2018 10:26:13 +0200
Subject: [PATCH] Try to fix travis (again)

---
 .travis.yml       | 2 +-
 scripts/travis.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6e9f740b5..f9300f7ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ matrix:
   - env: TEST_SUITE=lint
 
 script:
-  - travis_retry (killall -q peertube || true) && npm run travis -- "$TEST_SUITE"
+  - travis_retry npm run travis -- "$TEST_SUITE"
 
 after_failure:
   - cat test1/logs/all-logs.log
diff --git a/scripts/travis.sh b/scripts/travis.sh
index a5f604bb1..390500ed4 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -7,6 +7,8 @@ if [ $# -eq 0 ]; then
     exit -1
 fi
 
+killall -q peertube || true
+
 if [ "$1" = "misc" ]; then
     npm run build
     mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \