X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Freal-world%2Freal-world.js;h=9a63860adca7c47c869ff2a9c64712014dfdef3b;hb=d8cc063e9775688a1631eda9203411a2dba0333c;hp=dba1970c58f9169e39cae38497b3b388bbfc02eb;hpb=4613274479968f58f62c63178c92c1391de84297;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index dba1970c5..9a63860ad 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -2,6 +2,7 @@
 
 const each = require('async/each')
 const isEqual = require('lodash/isEqual')
+const differenceWith = require('lodash/differenceWith')
 const program = require('commander')
 const series = require('async/series')
 
@@ -20,21 +21,23 @@ program
   .option('-a, --action [interval]', 'Interval in ms for an action')
   .option('-i, --integrity [interval]', 'Interval in ms for an integrity check')
   .option('-f, --flush', 'Flush datas on exit')
+  .option('-d, --difference', 'Display difference if integrity is not okay')
   .parse(process.argv)
 
-const createWeight = parseInt(program.create) || 5
-const removeWeight = parseInt(program.remove) || 4
+const createWeight = program.create !== undefined ? parseInt(program.create) : 5
+const removeWeight = program.remove !== undefined ? parseInt(program.remove) : 4
 const flushAtExit = program.flush || false
-const actionInterval = parseInt(program.action) || 500
-let integrityInterval = parseInt(program.integrity) || 60000
+const actionInterval = program.action !== undefined ? parseInt(program.action) : 500
+let integrityInterval = program.integrity !== undefined ? parseInt(program.integrity) : 60000
+const displayDiffOnFail = program.integrity || false
 
 const numberOfPods = 6
-// Wait requests between pods
-const requestsMaxPerInterval = constants.INTERVAL / actionInterval
-const intervalsToMakeAllRequests = Math.ceil(requestsMaxPerInterval / constants.REQUESTS_LIMIT)
-const waitForBeforeIntegrityCheck = (intervalsToMakeAllRequests * constants.INTERVAL) + 1000
 
-integrityInterval += waitForBeforeIntegrityCheck
+// Wait requests between pods
+const baseRequestInterval = integrityInterval < constants.REQUESTS_INTERVAL ? integrityInterval : constants.REQUESTS_INTERVAL
+const requestsMaxPerInterval = baseRequestInterval / actionInterval
+const intervalsToMakeAllRequests = Math.ceil(requestsMaxPerInterval / (constants.REQUESTS_LIMIT_PER_POD * numberOfPods))
+const waitForBeforeIntegrityCheck = (intervalsToMakeAllRequests * constants.REQUESTS_INTERVAL) + 1000
 
 console.log('Create weight: %d, remove weight: %d.', createWeight, removeWeight)
 if (flushAtExit) {
@@ -42,6 +45,11 @@ if (flushAtExit) {
 } else {
   console.log('Program will not flush data on exit.')
 }
+if (displayDiffOnFail) {
+  console.log('Program will display diff on failure.')
+} else {
+  console.log('Program will not display diff on failure')
+}
 console.log('Interval in ms for each action: %d.', actionInterval)
 console.log('Interval in ms for each integrity check: %d.', integrityInterval)
 console.log('Will wait %d ms before an integrity check.', waitForBeforeIntegrityCheck)
@@ -73,6 +81,8 @@ runServers(numberOfPods, function (err, servers) {
   }, actionInterval)
 
   setInterval(function () {
+    if (checking === true) return
+
     console.log('Checking integrity...')
     checking = true
 
@@ -160,9 +170,9 @@ function exitServers (servers, callback) {
 function upload (servers, numServer, callback) {
   if (!callback) callback = function () {}
 
-  const name = 'my super name for pod 1'
-  const description = 'my super description for pod 1'
-  const tags = [ 'tag1p1', 'tag2p1' ]
+  const name = Date.now() + ' name'
+  const description = Date.now() + ' description'
+  const tags = [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ]
   const file = 'video_short1.webm'
 
   console.log('Upload video to server ' + numServer)
@@ -196,6 +206,7 @@ function checkIntegrity (servers, callback) {
         delete serverVideo.id
         delete serverVideo.isLocal
         delete serverVideo.thumbnailPath
+        delete serverVideo.updatedAt
       }
 
       videos.push(serverVideos)
@@ -205,6 +216,11 @@ function checkIntegrity (servers, callback) {
     for (const video of videos) {
       if (!isEqual(video, videos[0])) {
         console.error('Integrity not ok!')
+
+        if (displayDiffOnFail) {
+          console.log(differenceWith(videos[0], video, isEqual))
+        }
+
         process.exit(-1)
       }
     }