diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-24 15:10:37 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:25 +0200 |
commit | 7c3b79768bd174b22154e8d2df0b1211e01ee56a (patch) | |
tree | 9e45c9302083f0438f7ea174f5fb7d6042be5712 /server/tests/cli/update-host.ts | |
parent | 913b1d71e630d5a959c763bf565a171b4dc61434 (diff) | |
download | PeerTube-7c3b79768bd174b22154e8d2df0b1211e01ee56a.tar.gz PeerTube-7c3b79768bd174b22154e8d2df0b1211e01ee56a.tar.zst PeerTube-7c3b79768bd174b22154e8d2df0b1211e01ee56a.zip |
Use test wrapper exit function
Diffstat (limited to 'server/tests/cli/update-host.ts')
-rw-r--r-- | server/tests/cli/update-host.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index dd594779b..55c43b32f 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts | |||
@@ -7,17 +7,17 @@ import { waitJobs } from '../../../shared/extra-utils/server/jobs' | |||
7 | import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments' | 7 | import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments' |
8 | import { | 8 | import { |
9 | addVideoChannel, | 9 | addVideoChannel, |
10 | cleanupTests, | ||
10 | createUser, | 11 | createUser, |
11 | execCLI, | 12 | execCLI, |
12 | flushTests, | 13 | flushAndRunServer, |
13 | getEnvCli, | 14 | getEnvCli, |
14 | getVideo, | 15 | getVideo, |
15 | getVideoChannelsList, | 16 | getVideoChannelsList, |
16 | getVideosList, | 17 | getVideosList, |
17 | killallServers, | 18 | killallServers, |
18 | makeActivityPubGetRequest, | 19 | makeActivityPubGetRequest, |
19 | parseTorrentVideo, | 20 | parseTorrentVideo, reRunServer, |
20 | flushAndRunServer, | ||
21 | ServerInfo, | 21 | ServerInfo, |
22 | setAccessTokensToServers, | 22 | setAccessTokensToServers, |
23 | uploadVideo | 23 | uploadVideo |
@@ -70,7 +70,7 @@ describe('Test update host scripts', function () { | |||
70 | 70 | ||
71 | killallServers([ server ]) | 71 | killallServers([ server ]) |
72 | // Run server with standard configuration | 72 | // Run server with standard configuration |
73 | server = await flushAndRunServer(2) | 73 | await reRunServer(server) |
74 | 74 | ||
75 | const env = getEnvCli(server) | 75 | const env = getEnvCli(server) |
76 | await execCLI(`${env} npm run update-host`) | 76 | await execCLI(`${env} npm run update-host`) |
@@ -146,7 +146,7 @@ describe('Test update host scripts', function () { | |||
146 | } | 146 | } |
147 | }) | 147 | }) |
148 | 148 | ||
149 | after(function () { | 149 | after(async function () { |
150 | killallServers([ server ]) | 150 | await cleanupTests([ server ]) |
151 | }) | 151 | }) |
152 | }) | 152 | }) |