test: use reduced keysize for faster tests (ipfs-inactive#698)

dryajov · daviddias · commit cee9a3dd11f2 · 2018-03-06T12:14:57.000+01:00
diff --git a/package.json b/package.json
@@ -12,17 +12,17 @@
     "ipfs": false
   },
   "scripts": {
-    "test": "aegir test",
+    "test": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test",
     "test:node": "aegir test -t node",
-    "test:browser": "node --max-old-space-size=8192 $(npm bin)/aegir test -t browser",
-    "test:webworker": "node --max-old-space-size=8192 $(npm bin)/aegir test -t webworker",
+    "test:browser": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test -t browser",
+    "test:webworker": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir test -t webworker",
     "lint": "aegir lint",
     "build": "aegir build",
-    "release": "node --max-old-space-size=8192 $(npm bin)/aegir release ",
-    "release-minor": "node --max-old-space-size=8192 $(npm bin)/aegir release --type minor ",
-    "release-major": "node --max-old-space-size=8192 $(npm bin)/aegir release --type major ",
-    "coverage": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --timeout 100000",
-    "coverage-publish": "node --max-old-space-size=8192 $(npm bin)/aegir coverage --provider coveralls --timeout 100000"
+    "release": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release ",
+    "release-minor": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release --type minor ",
+    "release-major": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir release --type major ",
+    "coverage": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir coverage --timeout 100000",
+    "coverage-publish": "cross-env NODE_OPTIONS='--max-old-space-size=8192' aegir coverage --provider coveralls --timeout 100000"
   },
   "dependencies": {
     "async": "^2.6.0",
@@ -67,13 +67,15 @@
   "devDependencies": {
     "aegir": "^13.0.0",
     "chai": "^4.1.2",
+    "cross-env": "^5.1.3",
     "dirty-chai": "^2.0.1",
     "eslint-plugin-react": "^7.6.1",
     "go-ipfs-dep": "^0.4.13",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "~0.51.0",
     "hapi": "^17.2.0",
-    "ipfsd-ctl": "~0.28.0",
+    "interface-ipfs-core": "~0.51.0",
+    "ipfs": "~0.28.0",
+    "ipfsd-ctl": "~0.29.0",
     "pre-commit": "^1.2.2",
     "socket.io": "^2.0.4",
     "socket.io-client": "^2.0.4",
diff --git a/test/bitswap.spec.js b/test/bitswap.spec.js
@@ -19,7 +19,7 @@ describe('.bitswap', function () {
   before(function (done) {
     this.timeout(20 * 1000) // slow CI
 
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/commands.spec.js b/test/commands.spec.js
@@ -17,7 +17,7 @@ describe('.commands', function () {
   let ipfs
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/constructor.spec.js b/test/constructor.spec.js
@@ -27,7 +27,7 @@ describe('ipfs-api constructor tests', () => {
     before(function (done) {
       this.timeout(20 * 1000) // slow CI
 
-      f.spawn((err, node) => {
+      f.spawn({ initOptions: { bits: 1024 } }, (err, node) => {
         expect(err).to.not.exist()
         ipfsd = node
         apiAddr = node.apiAddr.toString()
diff --git a/test/diag.spec.js b/test/diag.spec.js
@@ -20,7 +20,7 @@ describe('.diag', function () {
   let ipfs
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/files.spec.js b/test/files.spec.js
@@ -37,7 +37,7 @@ describe('.files (the MFS API part)', function () {
   const expectedMultihash = 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP'
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/get.spec.js b/test/get.spec.js
@@ -31,7 +31,7 @@ describe('.get (specific go-ipfs features)', function () {
 
   before((done) => {
     series([
-      (cb) => f.spawn((err, _ipfsd) => {
+      (cb) => f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
         expect(err).to.not.exist()
         ipfsd = _ipfsd
         ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/interface/block.spec.js b/test/interface/block.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/bootstrap.spec.js b/test/interface/bootstrap.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/config.spec.js b/test/interface/config.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/dht.spec.js b/test/interface/dht.spec.js
@@ -12,7 +12,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/files-mfs.spec.js b/test/interface/files-mfs.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/files.spec.js b/test/interface/files.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/key.spec.js b/test/interface/key.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/miscellaneous.spec.js b/test/interface/miscellaneous.spec.js
@@ -12,7 +12,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/object.spec.js b/test/interface/object.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/pin.spec.js b/test/interface/pin.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/pubsub.spec.js b/test/interface/pubsub.spec.js
@@ -16,7 +16,7 @@ if (isNode) {
     setup: function (callback) {
       callback(null, {
         spawnNode: (cb) => {
-          f.spawn({ args: ['--enable-pubsub-experiment'] },
+          f.spawn({ initOptions: { bits: 1024 }, args: ['--enable-pubsub-experiment'] },
             (err, _ipfsd) => {
               if (err) {
                 return cb(err)
diff --git a/test/interface/repo.spec.js b/test/interface/repo.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/stats.spec.js b/test/interface/stats.spec.js
@@ -13,7 +13,7 @@ const common = {
   setup: function (callback) {
     callback(null, {
       spawnNode: (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/interface/swarm.spec.js b/test/interface/swarm.spec.js
@@ -23,7 +23,7 @@ const common = {
           config = undefined
         }
 
-        f.spawn({ repoPath, config }, (err, _ipfsd) => {
+        f.spawn({ repoPath, config, initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           if (err) {
             return cb(err)
           }
diff --git a/test/key.spec.js b/test/key.spec.js
@@ -17,7 +17,7 @@ describe('.key', function () {
   let ipfs
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/log.spec.js b/test/log.spec.js
@@ -17,7 +17,7 @@ describe('.log', function () {
   let ipfs
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/name.spec.js b/test/name.spec.js
@@ -27,15 +27,15 @@ describe('.name', () => {
 
     series([
       (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           expect(err).to.not.exist()
           ipfsd = _ipfsd
           ipfs = IPFSApi(_ipfsd.apiAddr)
           cb()
         })
       },
       (cb) => {
-        f.spawn((err, node) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, node) => {
           expect(err).to.not.exist()
           other = node.api
           otherd = node
diff --git a/test/ping.spec.js b/test/ping.spec.js
@@ -23,7 +23,7 @@ describe.skip('.ping', () => {
 
     series([
       (cb) => {
-        f.spawn((err, _ipfsd) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
           expect(err).to.not.exist()
           ipfsd = _ipfsd
           ipfs = IPFSApi(_ipfsd.apiAddr)
@@ -32,7 +32,7 @@ describe.skip('.ping', () => {
       },
       (cb) => {
         console.log('going to spawn second node')
-        f.spawn((err, node) => {
+        f.spawn({ initOptions: { bits: 1024 } }, (err, node) => {
           expect(err).to.not.exist()
           other = node.api
           otherd = node
diff --git a/test/pubsub-in-browser.spec.js b/test/pubsub-in-browser.spec.js
@@ -47,7 +47,7 @@ describe('.pubsub is not supported in the browser, yet!', function () {
   let ipfsd
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/refs.spec.js b/test/refs.spec.js
@@ -35,7 +35,7 @@ describe('.refs', function () {
     }
 
     waterfall([
-      (cb) => f.spawn(cb),
+      (cb) => f.spawn({ initOptions: { bits: 1024 } }, cb),
       (_ipfsd, cb) => {
         ipfsd = _ipfsd
         ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/repo.spec.js b/test/repo.spec.js
@@ -16,7 +16,7 @@ describe('.repo', function () {
   let ipfsd
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/stats.spec.js b/test/stats.spec.js
@@ -16,7 +16,7 @@ describe('stats', function () {
   let ipfsd
 
   before((done) => {
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)
diff --git a/test/util.spec.js b/test/util.spec.js
@@ -22,7 +22,7 @@ describe('.util', () => {
   before(function (done) {
     this.timeout(20 * 1000) // slow CI
 
-    f.spawn((err, _ipfsd) => {
+    f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
       ipfs = IPFSApi(_ipfsd.apiAddr)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const common = {`
`13`	`13`	`setup: function (callback) {`
`14`	`14`	`callback(null, {`
`15`	`15`	`spawnNode: (cb) => {`
`16`		`- f.spawn((err, _ipfsd) => {`
	`16`	`+ f.spawn({ initOptions: { bits: 1024 } }, (err, _ipfsd) => {`
`17`	`17`	`if (err) {`
`18`	`18`	`return cb(err)`
`19`	`19`	`}`