aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-02-02 13:45:58 +0100
committerChocobozzz <me@florianbigard.com>2021-02-02 13:45:58 +0100
commitd1a2ce5ef336a0fb260ff50a6740ebe483d9b8b9 (patch)
tree1176ffe6f5365c72fcbdd786dfe889d1a044ffd8
parentaaedadd5386b580e9ebac540201399c25c7f0b0f (diff)
downloadPeerTube-d1a2ce5ef336a0fb260ff50a6740ebe483d9b8b9.tar.gz
PeerTube-d1a2ce5ef336a0fb260ff50a6740ebe483d9b8b9.tar.zst
PeerTube-d1a2ce5ef336a0fb260ff50a6740ebe483d9b8b9.zip
Fix tmp tests
-rw-r--r--shared/extra-utils/server/servers.ts8
1 files changed, 6 insertions, 2 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 6ab7bee90..08d05ef36 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -272,8 +272,12 @@ async function reRunServer (server: ServerInfo, configOverride?: any) {
272 return server 272 return server
273} 273}
274 274
275function checkTmpIsEmpty (server: ServerInfo) { 275async function checkTmpIsEmpty (server: ServerInfo) {
276 return checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css' ]) 276 await checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css', 'hls' ])
277
278 if (await pathExists(join('test' + server.internalServerNumber, 'tmp', 'hls'))) {
279 await checkDirectoryIsEmpty(server, 'tmp/hls')
280 }
277} 281}
278 282
279async function checkDirectoryIsEmpty (server: ServerInfo, directory: string, exceptions: string[] = []) { 283async function checkDirectoryIsEmpty (server: ServerInfo, directory: string, exceptions: string[] = []) {