Verified Commit 70430c27 authored by Chocobozzz's avatar Chocobozzz
Browse files

Wait mock server termination

parent 6d210220
......@@ -243,7 +243,7 @@ function runTestSuite (options: {
})
after(async function () {
mockObjectStorage.terminate()
await mockObjectStorage.terminate()
await cleanupTests(servers)
})
......@@ -380,8 +380,8 @@ describe('Object storage for videos', function () {
playlistBucket: 'mybucket',
webtorrentBucket: 'mybucket',
playlistPrefix: 'streaming-playlists_',
webtorrentPrefix: 'webtorrent_',
playlistPrefix: 'streaming-playlists/',
webtorrentPrefix: 'webtorrent/',
useMockBaseUrl: true
})
......
......@@ -65,7 +65,7 @@ describe('Test proxy', function () {
})
after(async function () {
proxy.terminate()
await proxy.terminate()
await cleanupTests(servers)
})
......
......@@ -4,6 +4,7 @@ import { Server } from 'http'
import { pipeline } from 'stream'
import { randomInt } from '@shared/core-utils'
import { ObjectStorageCommand } from '../server'
import { terminateServer } from './utils'
export class MockObjectStorage {
private server: Server
......@@ -37,6 +38,6 @@ export class MockObjectStorage {
}
terminate () {
if (this.server) this.server.close()
return terminateServer(this.server)
}
}
import express, { Request, Response } from 'express'
import { Server } from 'http'
import { randomInt } from '@shared/core-utils'
import { terminateServer } from './utils'
type BlocklistResponse = {
data: {
......@@ -32,6 +33,6 @@ export class MockBlocklist {
}
terminate () {
if (this.server) this.server.close()
return terminateServer(this.server)
}
}
......@@ -2,6 +2,7 @@
import { createServer, Server } from 'http'
import proxy from 'proxy'
import { randomInt } from '@shared/core-utils'
import { terminateServer } from './utils'
class MockProxy {
private server: Server
......@@ -16,7 +17,7 @@ class MockProxy {
}
terminate () {
if (this.server) this.server.close()
return terminateServer(this.server)
}
}
......
import { Server } from 'http'
function terminateServer (server: Server) {
if (!server) return Promise.resolve()
return new Promise<void>((res, rej) => {
server.close(err => {
if (err) return rej(err)
return res()
})
})
}
export {
terminateServer
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment