aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/extra-utils/server
diff options
context:
space:
mode:
Diffstat (limited to 'shared/extra-utils/server')
-rw-r--r--shared/extra-utils/server/servers.ts10
1 files changed, 8 insertions, 2 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 41b48a8ee..bd3be8373 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -30,6 +30,7 @@ import {
30 ServicesCommand, 30 ServicesCommand,
31 StreamingPlaylistsCommand 31 StreamingPlaylistsCommand
32} from '../videos' 32} from '../videos'
33import { SQLCommand } from '../miscs'
33import { CommentsCommand } from '../videos/comments-command' 34import { CommentsCommand } from '../videos/comments-command'
34import { ConfigCommand } from './config-command' 35import { ConfigCommand } from './config-command'
35import { ContactFormCommand } from './contact-form-command' 36import { ContactFormCommand } from './contact-form-command'
@@ -123,6 +124,7 @@ interface ServerInfo {
123 streamingPlaylistsCommand?: StreamingPlaylistsCommand 124 streamingPlaylistsCommand?: StreamingPlaylistsCommand
124 channelsCommand?: ChannelsCommand 125 channelsCommand?: ChannelsCommand
125 commentsCommand?: CommentsCommand 126 commentsCommand?: CommentsCommand
127 sqlCommand?: SQLCommand
126} 128}
127 129
128function parallelTests () { 130function parallelTests () {
@@ -367,6 +369,7 @@ function assignCommands (server: ServerInfo) {
367 server.streamingPlaylistsCommand = new StreamingPlaylistsCommand(server) 369 server.streamingPlaylistsCommand = new StreamingPlaylistsCommand(server)
368 server.channelsCommand = new ChannelsCommand(server) 370 server.channelsCommand = new ChannelsCommand(server)
369 server.commentsCommand = new CommentsCommand(server) 371 server.commentsCommand = new CommentsCommand(server)
372 server.sqlCommand = new SQLCommand(server)
370} 373}
371 374
372async function reRunServer (server: ServerInfo, configOverride?: any) { 375async function reRunServer (server: ServerInfo, configOverride?: any) {
@@ -398,17 +401,20 @@ async function checkDirectoryIsEmpty (server: ServerInfo, directory: string, exc
398 expect(filtered).to.have.lengthOf(0) 401 expect(filtered).to.have.lengthOf(0)
399} 402}
400 403
401function killallServers (servers: ServerInfo[]) { 404async function killallServers (servers: ServerInfo[]) {
402 for (const server of servers) { 405 for (const server of servers) {
403 if (!server.app) continue 406 if (!server.app) continue
404 407
408 await server.sqlCommand.cleanup()
409
405 process.kill(-server.app.pid) 410 process.kill(-server.app.pid)
411
406 server.app = null 412 server.app = null
407 } 413 }
408} 414}
409 415
410async function cleanupTests (servers: ServerInfo[]) { 416async function cleanupTests (servers: ServerInfo[]) {
411 killallServers(servers) 417 await killallServers(servers)
412 418
413 if (isGithubCI()) { 419 if (isGithubCI()) {
414 await ensureDir('artifacts') 420 await ensureDir('artifacts')