diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-04-25 17:14:49 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-14 15:37:43 +0200 |
| commit | 7243f84db0f34c6d5610a54603b0cce7c284a7b3 (patch) | |
| tree | c913e9342ec83098bf30c1debd609a15318bc0fb /shared | |
| parent | da3a3ab6829107b3ed7f18dda42648dfde41871d (diff) | |
| download | PeerTube-7243f84db0f34c6d5610a54603b0cce7c284a7b3.tar.gz PeerTube-7243f84db0f34c6d5610a54603b0cce7c284a7b3.tar.zst PeerTube-7243f84db0f34c6d5610a54603b0cce7c284a7b3.zip | |
Redundancy and search tests in parallel too
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/extra-utils/server/servers.ts | 2 | ||||
| -rw-r--r-- | shared/extra-utils/users/user-notifications.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index ed41bfa48..3992735e1 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts | |||
| @@ -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) |
diff --git a/shared/extra-utils/users/user-notifications.ts b/shared/extra-utils/users/user-notifications.ts index 495ff80d9..f7de542bf 100644 --- a/shared/extra-utils/users/user-notifications.ts +++ b/shared/extra-utils/users/user-notifications.ts | |||
| @@ -380,7 +380,7 @@ async function checkNewCommentOnMyVideo (base: CheckerBaseParams, uuid: string, | |||
| 380 | } | 380 | } |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | const commentUrl = `http://localhost:9001/videos/watch/${uuid};threadId=${threadId}` | 383 | const commentUrl = `http://localhost:${base.server.port}/videos/watch/${uuid};threadId=${threadId}` |
| 384 | function emailFinder (email: object) { | 384 | function emailFinder (email: object) { |
| 385 | return email[ 'text' ].indexOf(commentUrl) !== -1 | 385 | return email[ 'text' ].indexOf(commentUrl) !== -1 |
| 386 | } | 386 | } |