5 files changed, 32 insertions, 15 deletions

diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index 5694ac922..34afd6a9d 100755
--- a/scripts/clean/server/test.sh
+++ b/scripts/clean/server/test.sh
@@ -17,8 +17,11 @@ removeFiles () {
 }
 
 dropRedis () {
-  redis-cli KEYS "bull-localhost:900$1*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
-  redis-cli KEYS "redis-localhost:900$1*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
+  port=$((9000+$1))
+
+  redis-cli KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
+  redis-cli KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
+  redis-cli KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
 }
 
 seq=$(seq 1 6)
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 4a677eacb..2b7cb5177 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -2,6 +2,7 @@ import * as program from 'commander'
 import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers'
 import { JobQueue } from '../server/lib/job-queue'
+import { VideoTranscodingPayload } from '../server/lib/job-queue/handlers/video-transcoding'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -31,15 +32,9 @@ async function run () {
   const video = await VideoModel.loadByUUIDWithFile(program['video'])
   if (!video) throw new Error('Video not found.')
 
-  const dataInput = {
-    videoUUID: video.uuid,
-    isNewVideo: false,
-    resolution: undefined
-  }
-
-  if (program.resolution !== undefined) {
-    dataInput.resolution = program.resolution
-  }
+  const dataInput: VideoTranscodingPayload = program.resolution !== undefined
+   ? { type: 'new-resolution' as 'new-resolution', videoUUID: video.uuid, isNewVideo: false, resolution: program.resolution }
+   : { type: 'optimize' as 'optimize', videoUUID: video.uuid, isNewVideo: false }
 
   await JobQueue.Instance.init()
   await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
diff --git a/scripts/setup/cli.sh b/scripts/setup/cli.sh
new file mode 100755
index 000000000..9808868d3
--- /dev/null
+++ b/scripts/setup/cli.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -eu
+
+NOCLIENT=1 yarn install --pure-lockfile
+
+rm -rf ./dist/server/tools/
+
+(
+    cd ./server/tools
+    yarn install --pure-lockfile
+)
+
+npm run tsc -- --build ./server/tools/tsconfig.json
+
+mv "./server/tools/node_modules" "./dist/server/tools"
diff --git a/scripts/test.sh b/scripts/test.sh
index cf8895365..5ec7a5920 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -3,6 +3,8 @@
 set -eu
 
 npm run build:server
+npm run setup:cli
+
 npm run travis -- lint
 
 mocha --exit --require ts-node/register/type-check --bail server/tests/index.ts
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 3557816c8..664d9fd6c 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -17,19 +17,20 @@ if [ "$1" = "misc" ]; then
         server/tests/helpers/index.ts
 elif [ "$1" = "cli" ]; then
     npm run build:server
+    CC=gcc-4.9 CXX=g++-4.9 npm run setup:cli
     mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
 elif [ "$1" = "api-1" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-1.ts
+    sh ./server/tests/api/travis-1.sh 2
 elif [ "$1" = "api-2" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-2.ts
+    sh ./server/tests/api/travis-2.sh 2
 elif [ "$1" = "api-3" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-3.ts
+    sh ./server/tests/api/travis-3.sh 2
 elif [ "$1" = "api-4" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-4.ts
+    sh ./server/tests/api/travis-4.sh 2
 elif [ "$1" = "lint" ]; then
     npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"