diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-05-16 08:43:35 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-16 08:43:35 +0200 |
| commit | bec4ea343987c69252b84d02f444c0f033d4a3f9 (patch) | |
| tree | c0c709104aa97f1b5472a17e3e0c1436ab2dab06 /shared/extra-utils/server | |
| parent | ab5f9ed86e08cb7de3a1be955ca991a4517bdc57 (diff) | |
| parent | d183ee9bda2588f07032ca4a2fce58651e684abf (diff) | |
| download | PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.tar.gz PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.tar.zst PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.zip | |
Merge branch 'feature/parallel-tests' into develop
Diffstat (limited to 'shared/extra-utils/server')
| -rw-r--r-- | shared/extra-utils/server/servers.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index ed41bfa48..4c7d6862a 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts | |||
| @@ -246,7 +246,7 @@ async function checkTmpIsEmpty (server: ServerInfo) { | |||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) { | 248 | async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) { |
| 249 | const testDirectory = 'test' + server.serverNumber | 249 | const testDirectory = 'test' + server.internalServerNumber |
| 250 | 250 | ||
| 251 | const directoryPath = join(root(), testDirectory, directory) | 251 | const directoryPath = join(root(), testDirectory, directory) |
| 252 | 252 | ||
| @@ -284,7 +284,7 @@ function cleanupTests (servers: ServerInfo[]) { | |||
| 284 | } | 284 | } |
| 285 | 285 | ||
| 286 | async function waitUntilLog (server: ServerInfo, str: string, count = 1) { | 286 | async function waitUntilLog (server: ServerInfo, str: string, count = 1) { |
| 287 | const logfile = join(root(), 'test' + server.serverNumber, 'logs/peertube.log') | 287 | const logfile = join(root(), 'test' + server.internalServerNumber, 'logs/peertube.log') |
| 288 | 288 | ||
| 289 | while (true) { | 289 | while (true) { |
| 290 | const buf = await readFile(logfile) | 290 | const buf = await readFile(logfile) |