Fix live constraints tests

diff --git a/server/helpers/geo-ip.ts b/server/helpers/geo-ip.ts
index 4ba7011c2cf2137f555c65457851135d8aa824bb..9e44d660f2789e593a33db2706efdb3fbb86fd91 100644 (file)
--- a/server/helpers/geo-ip.ts
+++ b/server/helpers/geo-ip.ts
@@ -53,7 +53,7 @@ export class GeoIP {
 
       await writeFile(mmdbPath, gotResult.body)
 
-      // Reini reader
+      // Reinit reader
       this.reader = undefined
 
       logger.info('GeoIP database updated %s.', mmdbPath, lTags())

diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts
index b819733953c237ab0996d4bd72880b586712b4cc..cab76f425908febeb147c2c1aa88bfabd052df95 100644 (file)
--- a/server/tests/api/live/live-constraints.ts
+++ b/server/tests/api/live/live-constraints.ts
@@ -13,6 +13,7 @@ import {
   setAccessTokensToServers,
   setDefaultVideoChannel,
   waitJobs,
+  waitUntilLiveReplacedByReplayOnAllServers,
   waitUntilLiveWaitingOnAllServers
 } from '@shared/server-commands'
 import { checkLiveCleanup } from '../../shared'
@@ -53,12 +54,6 @@ describe('Test live constraints', function () {
     await checkLiveCleanup(servers[0], videoId, resolutions)
   }
 
-  async function waitUntilLivePublishedOnAllServers (videoId: string) {
-    for (const server of servers) {
-      await server.live.waitUntilPublished({ videoId })
-    }
-  }
-
   function updateQuota (options: { total: number, daily: number }) {
     return servers[0].users.update({
       userId,
@@ -117,7 +112,7 @@ describe('Test live constraints', function () {
     const userVideoLiveoId = await createLiveWrapper({ replay: true, permanent: false })
     await servers[0].live.runAndTestStreamError({ token: userAccessToken, videoId: userVideoLiveoId, shouldHaveError: true })
 
-    await waitUntilLivePublishedOnAllServers(userVideoLiveoId)
+    await waitUntilLiveReplacedByReplayOnAllServers(servers, userVideoLiveoId)
     await waitJobs(servers)
 
     await checkSaveReplay(userVideoLiveoId)
@@ -153,7 +148,7 @@ describe('Test live constraints', function () {
     const userVideoLiveoId = await createLiveWrapper({ replay: true, permanent: false })
     await servers[0].live.runAndTestStreamError({ token: userAccessToken, videoId: userVideoLiveoId, shouldHaveError: true })
 
-    await waitUntilLivePublishedOnAllServers(userVideoLiveoId)
+    await waitUntilLiveReplacedByReplayOnAllServers(servers, userVideoLiveoId)
     await waitJobs(servers)
 
     await checkSaveReplay(userVideoLiveoId)
@@ -194,7 +189,7 @@ describe('Test live constraints', function () {
     const userVideoLiveoId = await createLiveWrapper({ replay: true, permanent: false })
     await servers[0].live.runAndTestStreamError({ token: userAccessToken, videoId: userVideoLiveoId, shouldHaveError: true })
 
-    await waitUntilLivePublishedOnAllServers(userVideoLiveoId)
+    await waitUntilLiveReplacedByReplayOnAllServers(servers, userVideoLiveoId)
     await waitJobs(servers)
 
     await checkSaveReplay(userVideoLiveoId, [ 720, 480, 360, 240, 144 ])