diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/cli/index.ts | 2 | ||||
-rw-r--r-- | server/tests/cli/peertube.ts | 2 | ||||
-rwxr-xr-x | 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 @@ | |||
1 | // Order of the tests we want to execute | 1 | // Order of the tests we want to execute |
2 | import './create-transcoding-job' | ||
3 | import './create-import-video-file-job' | 2 | import './create-import-video-file-job' |
3 | import './create-transcoding-job' | ||
4 | import './peertube' | 4 | import './peertube' |
5 | import './reset-password' | 5 | import './reset-password' |
6 | import './update-host' | 6 | 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 () { | |||
40 | this.timeout(60000) | 40 | this.timeout(60000) |
41 | 41 | ||
42 | const env = getEnvCli(server) | 42 | const env = getEnvCli(server) |
43 | const stdout = await execCLI(`${env} ` + cmd + ` auth add --url ${server.url} -U user_1 -p "super password"`) | 43 | await execCLI(`${env} ` + cmd + ` auth add --url ${server.url} -U user_1 -p "super password"`) |
44 | }) | 44 | }) |
45 | 45 | ||
46 | after(async function () { | 46 | 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) { | |||
62 | 62 | ||
63 | getSettings() | 63 | getSettings() |
64 | .then(settings => { | 64 | .then(settings => { |
65 | const state = (settings.default === -1) ? | 65 | const state = (settings.default === undefined || settings.default === -1) ? |
66 | 'no instance selected, commands will require explicit arguments' : | 66 | 'no instance selected, commands will require explicit arguments' : |
67 | ('instance ' + settings.remotes[settings.default] + ' selected') | 67 | ('instance ' + settings.remotes[settings.default] + ' selected') |
68 | program | 68 | program |