From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 12 Jan 2017 09:06:03 +0000 (+0100)
Subject: Try to fix travis build
X-Git-Tag: v0.0.1-alpha~574^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=790e65fcf7a0a9f065ecc68c5982efb80cd2e1ca;p=oweals%2Fpeertube.git

Try to fix travis build
---

diff --git a/server/tests/api/multiple-pods.js b/server/tests/api/multiple-pods.js
index 169a9f2e0..df12ba0e9 100644
--- a/server/tests/api/multiple-pods.js
+++ b/server/tests/api/multiple-pods.js
@@ -312,7 +312,7 @@ describe('Test multiple pods', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          webtorrent.remove(video.magnetUri, done)
+          done()
         })
       })
     })
@@ -331,7 +331,7 @@ describe('Test multiple pods', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          webtorrent.remove(video.magnetUri, done)
+          done()
         })
       })
     })
@@ -350,7 +350,7 @@ describe('Test multiple pods', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          webtorrent.remove(video.magnetUri, done)
+          done()
         })
       })
     })
@@ -369,7 +369,7 @@ describe('Test multiple pods', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          webtorrent.remove(video.magnetUri, done)
+          done()
         })
       })
     })
@@ -419,7 +419,7 @@ describe('Test multiple pods', function () {
               expect(torrent.files.length).to.equal(1)
               expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-              webtorrent.remove(videoUpdated.magnetUri, callback)
+              callback()
             })
           })
         })
diff --git a/server/tests/api/single-pod.js b/server/tests/api/single-pod.js
index 04b93fac7..2ac83bbf4 100644
--- a/server/tests/api/single-pod.js
+++ b/server/tests/api/single-pod.js
@@ -96,7 +96,7 @@ describe('Test a single pod', function () {
           expect(torrent.files.length).to.equal(1)
           expect(torrent.files[0].path).to.exist.and.to.not.equal('')
 
-          webtorrent.remove(video.magnetUri, done)
+          done()
         })
       })
     })
diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index 941e43a2e..12ab06d6d 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -30,16 +30,16 @@ const removeWeight = program.remove !== undefined ? parseInt(program.remove) : 4
 const updateWeight = program.update !== undefined ? parseInt(program.update) : 4
 const flushAtExit = program.flush || false
 const actionInterval = program.action !== undefined ? parseInt(program.action) : 500
-let integrityInterval = program.integrity !== undefined ? parseInt(program.integrity) : 60000
+const integrityInterval = program.integrity !== undefined ? parseInt(program.integrity) : 60000
 const displayDiffOnFail = program.integrity || false
 
 const numberOfPods = 6
 
 // Wait requests between pods
-const baseRequestInterval = integrityInterval < constants.REQUESTS_INTERVAL ? integrityInterval : constants.REQUESTS_INTERVAL
+const baseRequestInterval = integrityInterval < constants.REQUESTS_INTERVAL ? constants.REQUESTS_INTERVAL : integrityInterval
 const requestsMaxPerInterval = baseRequestInterval / actionInterval
 const intervalsToMakeAllRequests = Math.ceil(requestsMaxPerInterval / constants.REQUESTS_LIMIT_PER_POD)
-const waitForBeforeIntegrityCheck = (intervalsToMakeAllRequests * constants.REQUESTS_INTERVAL) + 1000
+const waitForBeforeIntegrityCheck = (intervalsToMakeAllRequests * constants.REQUESTS_INTERVAL) - integrityInterval + 1000
 
 console.log('Create weight: %d, update weight: %d, remove weight: %d.', createWeight, updateWeight, removeWeight)
 if (flushAtExit) {