Try to fix travis (again)

diff --git a/.travis.yml b/.travis.yml
index 6e9f740b504a912ae45c8208172084492f547efd..f9300f7ff64c8b5cbecfce4f64cba97175701731 100644 (file)
--- 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 a5f604bb1fc31a4dc7a07ee9e661be8cd6f308ea..390500ed451549e64ee7e469ea7d7e2f98e9ba0f 100755 (executable)
--- 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 \