diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-16 09:47:51 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:18 +0200 |
commit | 254d3579f5338f5fd775c17d15cdfc37078bcfb4 (patch) | |
tree | eaeb13fda16c16e98cd6991d202b0ca6a4cbdb63 /server/tests/cli/update-host.ts | |
parent | 89d241a79c262b9775c233b73cff080043ebb5e6 (diff) | |
download | PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.tar.gz PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.tar.zst PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.zip |
Use an object to represent a server
Diffstat (limited to 'server/tests/cli/update-host.ts')
-rw-r--r-- | server/tests/cli/update-host.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index d2d196456..fcbcb55ba 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts | |||
@@ -4,18 +4,17 @@ import 'mocha' | |||
4 | import { expect } from 'chai' | 4 | import { expect } from 'chai' |
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | flushAndRunServer, | 7 | createSingleServer, |
8 | killallServers, | 8 | killallServers, |
9 | makeActivityPubGetRequest, | 9 | makeActivityPubGetRequest, |
10 | parseTorrentVideo, | 10 | parseTorrentVideo, |
11 | reRunServer, | 11 | PeerTubeServer, |
12 | ServerInfo, | ||
13 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
14 | waitJobs | 13 | waitJobs |
15 | } from '@shared/extra-utils' | 14 | } from '@shared/extra-utils' |
16 | 15 | ||
17 | describe('Test update host scripts', function () { | 16 | describe('Test update host scripts', function () { |
18 | let server: ServerInfo | 17 | let server: PeerTubeServer |
19 | 18 | ||
20 | before(async function () { | 19 | before(async function () { |
21 | this.timeout(60000) | 20 | this.timeout(60000) |
@@ -26,7 +25,7 @@ describe('Test update host scripts', function () { | |||
26 | } | 25 | } |
27 | } | 26 | } |
28 | // Run server 2 to have transcoding enabled | 27 | // Run server 2 to have transcoding enabled |
29 | server = await flushAndRunServer(2, overrideConfig) | 28 | server = await createSingleServer(2, overrideConfig) |
30 | await setAccessTokensToServers([ server ]) | 29 | await setAccessTokensToServers([ server ]) |
31 | 30 | ||
32 | // Upload two videos for our needs | 31 | // Upload two videos for our needs |
@@ -56,7 +55,7 @@ describe('Test update host scripts', function () { | |||
56 | 55 | ||
57 | await killallServers([ server ]) | 56 | await killallServers([ server ]) |
58 | // Run server with standard configuration | 57 | // Run server with standard configuration |
59 | await reRunServer(server) | 58 | await server.run() |
60 | 59 | ||
61 | await server.cli.execWithEnv(`npm run update-host`) | 60 | await server.cli.execWithEnv(`npm run update-host`) |
62 | }) | 61 | }) |