wip: rework tests

ipfs · Mar 1, 2018 · 226341e · 226341e
1 parent 150926e
commit 226341e
Show file tree

Hide file tree

Showing 7 changed files with 644 additions and 865 deletions.
diff --git a/.aegir.js b/.aegir.js
@@ -15,18 +15,20 @@ module.exports = {
       served: true,
       included: false
     }],
-    singleRun: true,
+    singleRun: false,
     captureTimeout: 5000 * 1000,
     // browserDisconnectTolerance: 3, //this one helps
     browserDisconnectTimeout: 5000 * 1000,
-    browserNoActivityTimeout: 5000 * 1000,
+    browserNoActivityTimeout: 5000 * 1000
   },
   hooks: {
     pre: (done) => {
       parallel([
         (cb) => server.start(cb),
         (cb) => {
-          rendezvous.start({port: 24642}, (err, _rzserver) => {
+          rendezvous.start({
+            port: 24642
+          }, (err, _rzserver) => {
             if (err) {
               return done(err)
             }

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "test": "cross-env IPFS_REUSEPORT=false aegir test -t node -t browser --no-cors --timeout 1000000",
+    "test": "cross-env IPFS_REUSEPORT=false aegir test -t node -t browser --no-cors --timeout 50000",
     "test:node": "cross-env IPFS_REUSEPORT=false aegir test -t node -f test/node.js",
     "test:browser": "cross-env IPFS_REUSEPORT=false aegir test -t browser --no-cors -f test/browser.js"
   },

diff --git a/test/browser.js b/test/browser.js
@@ -4,5 +4,5 @@
 // require('./exchange-files')
 // require('./pubsub')
 require('./kad-dht')
-require('./circuit-relay')
+require('./circuit')
 // require('./repo')