diff options
Diffstat (limited to 'shared/extra-utils/server/servers.ts')
-rw-r--r-- | shared/extra-utils/server/servers.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index 75e79cc41..1126a7d93 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts | |||
@@ -6,7 +6,7 @@ import { copy, pathExists, readdir, readFile, remove } from 'fs-extra' | |||
6 | import { join } from 'path' | 6 | import { join } from 'path' |
7 | import { randomInt } from '../../core-utils/miscs/miscs' | 7 | import { randomInt } from '../../core-utils/miscs/miscs' |
8 | import { VideoChannel } from '../../models/videos' | 8 | import { VideoChannel } from '../../models/videos' |
9 | import { getFileSize, root, wait } from '../miscs/miscs' | 9 | import { buildServerDirectory, getFileSize, root, wait } from '../miscs/miscs' |
10 | 10 | ||
11 | interface ServerInfo { | 11 | interface ServerInfo { |
12 | app: ChildProcess | 12 | app: ChildProcess |
@@ -309,7 +309,7 @@ function cleanupTests (servers: ServerInfo[]) { | |||
309 | } | 309 | } |
310 | 310 | ||
311 | async function waitUntilLog (server: ServerInfo, str: string, count = 1, strictCount = true) { | 311 | async function waitUntilLog (server: ServerInfo, str: string, count = 1, strictCount = true) { |
312 | const logfile = join(root(), 'test' + server.internalServerNumber, 'logs/peertube.log') | 312 | const logfile = buildServerDirectory(server, 'logs/peertube.log') |
313 | 313 | ||
314 | while (true) { | 314 | while (true) { |
315 | const buf = await readFile(logfile) | 315 | const buf = await readFile(logfile) |
@@ -323,7 +323,7 @@ async function waitUntilLog (server: ServerInfo, str: string, count = 1, strictC | |||
323 | } | 323 | } |
324 | 324 | ||
325 | async function getServerFileSize (server: ServerInfo, subPath: string) { | 325 | async function getServerFileSize (server: ServerInfo, subPath: string) { |
326 | const path = join(root(), 'test' + server.internalServerNumber, subPath) | 326 | const path = buildServerDirectory(server, subPath) |
327 | 327 | ||
328 | return getFileSize(path) | 328 | return getFileSize(path) |
329 | } | 329 | } |