]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix redundancy test
authorChocobozzz <me@florianbigard.com>
Tue, 16 Oct 2018 07:37:32 +0000 (09:37 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 16 Oct 2018 14:41:36 +0000 (16:41 +0200)
server/tests/api/server/redundancy.ts

index 1960854b654136e5d5b40818c7aa5490a40f95a7..f50d6e3cfee46aaf73e237b6abe40ee2841c000f 100644 (file)
@@ -419,7 +419,7 @@ describe('Test videos redundancy', function () {
 
       killallServers([ servers[0] ])
 
-      await wait(10000)
+      await wait(15000)
 
       await checkNotContains([ servers[1], servers[2] ], 'http%3A%2F%2Flocalhost%3A9001')
     })
@@ -452,26 +452,22 @@ describe('Test videos redundancy', function () {
     })
 
     it('Should cache video 2 webseed on the first video', async function () {
-      this.timeout(50000)
+      this.timeout(120000)
 
       await waitJobs(servers)
 
-      await wait(7000)
+      let checked = false
 
-      try {
-        await check1WebSeed(strategy, video1Server2UUID)
-        await check2Webseeds(strategy, video2Server2UUID)
-      } catch {
-        await wait(3000)
+      while (checked === false) {
+        await wait(1000)
 
         try {
           await check1WebSeed(strategy, video1Server2UUID)
           await check2Webseeds(strategy, video2Server2UUID)
-        } catch {
-          await wait(5000)
 
-          await check1WebSeed(strategy, video1Server2UUID)
-          await check2Webseeds(strategy, video2Server2UUID)
+          checked = true
+        } catch {
+          checked = false
         }
       }
     })