X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fserver%2Fservers.ts;h=0f883d839c08bf3eedc71cf19a020dcbf6350228;hb=35b30b643cf9870b0934f34253ffb23cf6a264b0;hp=a0f0ce9c9792f11885e0a8ff5cd0814ab057bb65;hpb=4c1def5fd8e9f483238eb38e221f555e2e6bbf07;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index a0f0ce9c9..0f883d839 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts @@ -285,7 +285,7 @@ function cleanupTests (servers: ServerInfo[]) { return Promise.all(p) } -async function waitUntilLog (server: ServerInfo, str: string, count = 1) { +async function waitUntilLog (server: ServerInfo, str: string, count = 1, strictCount = true) { const logfile = join(root(), 'test' + server.internalServerNumber, 'logs/peertube.log') while (true) { @@ -293,6 +293,7 @@ async function waitUntilLog (server: ServerInfo, str: string, count = 1) { const matches = buf.toString().match(new RegExp(str, 'g')) if (matches && matches.length === count) return + if (matches && strictCount === false && matches.length >= count) return await wait(1000) }