diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-24 10:53:40 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:23 +0200 |
commit | 210feb6cc484a6c5c63c98f770de34e223f944cb (patch) | |
tree | d1d841892a7ac87ac0d434194597606a375aaed1 /server/tests/cli/update-host.ts | |
parent | 9cc8d43e37a61709e7275c2a799bdf976dd940ca (diff) | |
download | PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.gz PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.zst PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.zip |
Cleanup tests
Diffstat (limited to 'server/tests/cli/update-host.ts')
-rw-r--r-- | server/tests/cli/update-host.ts | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index 2270ff494..dd594779b 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts | |||
@@ -17,7 +17,7 @@ import { | |||
17 | killallServers, | 17 | killallServers, |
18 | makeActivityPubGetRequest, | 18 | makeActivityPubGetRequest, |
19 | parseTorrentVideo, | 19 | parseTorrentVideo, |
20 | runServer, | 20 | flushAndRunServer, |
21 | ServerInfo, | 21 | ServerInfo, |
22 | setAccessTokensToServers, | 22 | setAccessTokensToServers, |
23 | uploadVideo | 23 | uploadVideo |
@@ -32,15 +32,13 @@ describe('Test update host scripts', function () { | |||
32 | before(async function () { | 32 | before(async function () { |
33 | this.timeout(60000) | 33 | this.timeout(60000) |
34 | 34 | ||
35 | await flushTests() | ||
36 | |||
37 | const overrideConfig = { | 35 | const overrideConfig = { |
38 | webserver: { | 36 | webserver: { |
39 | port: 9256 | 37 | port: 9256 |
40 | } | 38 | } |
41 | } | 39 | } |
42 | // Run server 2 to have transcoding enabled | 40 | // Run server 2 to have transcoding enabled |
43 | server = await runServer(2, overrideConfig) | 41 | server = await flushAndRunServer(2, overrideConfig) |
44 | await setAccessTokensToServers([ server ]) | 42 | await setAccessTokensToServers([ server ]) |
45 | 43 | ||
46 | // Upload two videos for our needs | 44 | // Upload two videos for our needs |
@@ -72,7 +70,7 @@ describe('Test update host scripts', function () { | |||
72 | 70 | ||
73 | killallServers([ server ]) | 71 | killallServers([ server ]) |
74 | // Run server with standard configuration | 72 | // Run server with standard configuration |
75 | server = await runServer(2) | 73 | server = await flushAndRunServer(2) |
76 | 74 | ||
77 | const env = getEnvCli(server) | 75 | const env = getEnvCli(server) |
78 | await execCLI(`${env} npm run update-host`) | 76 | await execCLI(`${env} npm run update-host`) |
@@ -148,7 +146,7 @@ describe('Test update host scripts', function () { | |||
148 | } | 146 | } |
149 | }) | 147 | }) |
150 | 148 | ||
151 | after(async function () { | 149 | after(function () { |
152 | killallServers([ server ]) | 150 | killallServers([ server ]) |
153 | }) | 151 | }) |
154 | }) | 152 | }) |