From 5c142a4bab955d2dbe831efd537c2fe52246db13 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 20 Sep 2018 16:35:48 +0200 Subject: [PATCH] Fix peertube script --- server/tests/cli/index.ts | 2 +- server/tests/cli/peertube.ts | 2 +- server/tools/peertube.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/tests/cli/index.ts b/server/tests/cli/index.ts index 33e33a070..6201314ce 100644 --- a/server/tests/cli/index.ts +++ b/server/tests/cli/index.ts @@ -1,6 +1,6 @@ // Order of the tests we want to execute -import './create-transcoding-job' import './create-import-video-file-job' +import './create-transcoding-job' import './peertube' import './reset-password' import './update-host' diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts index 548fd1257..65cb05a1a 100644 --- a/server/tests/cli/peertube.ts +++ b/server/tests/cli/peertube.ts @@ -40,7 +40,7 @@ describe('Test CLI wrapper', function () { this.timeout(60000) const env = getEnvCli(server) - const stdout = await execCLI(`${env} ` + cmd + ` auth add --url ${server.url} -U user_1 -p "super password"`) + await execCLI(`${env} ` + cmd + ` auth add --url ${server.url} -U user_1 -p "super password"`) }) after(async function () { diff --git a/server/tools/peertube.ts b/server/tools/peertube.ts index 7441161b1..21609deed 100755 --- a/server/tools/peertube.ts +++ b/server/tools/peertube.ts @@ -62,7 +62,7 @@ if (!process.argv.slice(2).length) { getSettings() .then(settings => { - const state = (settings.default === -1) ? + const state = (settings.default === undefined || settings.default === -1) ? 'no instance selected, commands will require explicit arguments' : ('instance ' + settings.remotes[settings.default] + ' selected') program -- 2.41.0