From 210feb6cc484a6c5c63c98f770de34e223f944cb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 24 Apr 2019 10:53:40 +0200 Subject: Cleanup tests --- server/tests/cli/update-host.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'server/tests/cli/update-host.ts') 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 { killallServers, makeActivityPubGetRequest, parseTorrentVideo, - runServer, + flushAndRunServer, ServerInfo, setAccessTokensToServers, uploadVideo @@ -32,15 +32,13 @@ describe('Test update host scripts', function () { before(async function () { this.timeout(60000) - await flushTests() - const overrideConfig = { webserver: { port: 9256 } } // Run server 2 to have transcoding enabled - server = await runServer(2, overrideConfig) + server = await flushAndRunServer(2, overrideConfig) await setAccessTokensToServers([ server ]) // Upload two videos for our needs @@ -72,7 +70,7 @@ describe('Test update host scripts', function () { killallServers([ server ]) // Run server with standard configuration - server = await runServer(2) + server = await flushAndRunServer(2) const env = getEnvCli(server) await execCLI(`${env} npm run update-host`) @@ -148,7 +146,7 @@ describe('Test update host scripts', function () { } }) - after(async function () { + after(function () { killallServers([ server ]) }) }) -- cgit v1.2.3