add run sequence

daviddias · daviddias · commit bc72e3614d01 · 2015-10-25T20:24:46.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 some-test.js
 npm-debug.log
+sauce_connect.log
diff --git a/gulpfile.js b/gulpfile.js
@@ -3,9 +3,13 @@ var Server = require('karma').Server
 var mocha = require('gulp-mocha')
 var ipfsd = require('ipfsd-ctl')
 var fs = require('fs')
+var runSequence = require('run-sequence')
 
-gulp.task('default', function () {
-  gulp.start('test:node', 'test:browser')
+gulp.task('default', function (done) {
+  runSequence(
+    'test:node',
+    // 'test:browser',
+    done)
 })
 
 gulp.task('test:node', function (done) {
@@ -19,16 +23,25 @@ gulp.task('test:node', function (done) {
       .once('end', function () {
         stopDisposableDaemons(daemons, function () {
           process.exit()
+          // done()
         })
       })
   })
 })
 
 gulp.task('test:browser', function (done) {
-  new Server({
-    configFile: __dirname + '/karma.conf.js',
-    singleRun: true
-  }, done).start()
+  startDisposableDaemons(function (daemons) {
+    new Server({
+      configFile: __dirname + '/karma.conf.js',
+      singleRun: true
+    }, finish).start()
+
+    function finish () {
+      stopDisposableDaemons(daemons, function () {
+        done()
+      })
+    }
+  })
 })
 
 function startDisposableDaemons (callback) {
@@ -54,10 +67,9 @@ function startDisposableDaemons (callback) {
         throw err
       }
 
-      console.log('ipfs init done - ' + key)
       ipfsNodes[key] = node
 
-      console.log('ipfs config (bootstrap and mdns off) - ' + key)
+      console.log('  ipfs init done - (bootstrap and mdns off) - ' + key)
 
       ipfsNodes[key].setConfig('Bootstrap', null, function (err) {
         if (err) {
diff --git a/karma.conf.js b/karma.conf.js
@@ -39,7 +39,7 @@ module.exports = function (config) {
     basePath: '',
     frameworks: ['browserify', 'mocha'],
     files: [
-      'test/test.js'
+      'test/tests.js'
     ],
     exclude: [],
     preprocessors: {
diff --git a/package.json b/package.json
@@ -37,14 +37,14 @@
     "karma-sauce-launcher": "^0.3.0",
     "mocha": "^2.3.3",
     "pre-commit": "^1.0.6",
+    "run-sequence": "^1.1.4",
     "standard": "^5.2.2",
     "uglify-js": "^2.4.24"
   },
   "scripts": {
     "test": "./node_modules/.bin/gulp",
     "test:node": "./node_modules/.bin/gulp test:node",
     "test:browser": "./node_modules/.bin/gulp test:browser",
-
     "lint": "./node_modules/.bin/standard",
     "build": "./node_modules/.bin/browserify -t brfs -s ipfsAPI -e ./src/index.js | tee dist/ipfsapi.js | ./node_modules/.bin/uglifyjs -m > dist/ipfsapi.min.js"
   },
diff --git a/src/index.js b/src/index.js
@@ -138,7 +138,7 @@ function IpfsAPI (host_or_multiaddr, port) {
 
   self.swarm = {
     peers: command('swarm/peers'),
-    connect: argCommand('swarm/peers')
+    connect: argCommand('swarm/connect')
   }
 
   self.ping = function (id, cb) {
diff --git a/test/tests.js b/test/tests.js
@@ -50,7 +50,9 @@ describe('IPFS Node.js API wrapper tests', function () {
     }
 
     function dial () {
-      apiClients['a'].swarm.connect(addrs['b'], function (err) {
+      console.log(addrs)
+      apiClients['a'].swarm.connect(addrs['b'], function (err, res) {
+        console.log('->', res)
         if (err) {
           throw err
         }
diff --git a/test/tmp-disposable-nodes-addrs.json b/test/tmp-disposable-nodes-addrs.json
@@ -1 +1 @@
-{"b":"/ip4/127.0.0.1/tcp/52153","c":"/ip4/127.0.0.1/tcp/52166","a":"/ip4/127.0.0.1/tcp/52169"}
+{"a":"/ip4/127.0.0.1/tcp/56689","b":"/ip4/127.0.0.1/tcp/56694","c":"/ip4/127.0.0.1/tcp/56697"}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ function IpfsAPI (host_or_multiaddr, port) {`
`138`	`138`
`139`	`139`	`self.swarm = {`
`140`	`140`	`peers: command('swarm/peers'),`
`141`		`- connect: argCommand('swarm/peers')`
	`141`	`+ connect: argCommand('swarm/connect')`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`self.ping = function (id, cb) {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ describe('IPFS Node.js API wrapper tests', function () {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`function dial () {`
`53`		`- apiClients['a'].swarm.connect(addrs['b'], function (err) {`
	`53`	`+ console.log(addrs)`
	`54`	`+ apiClients['a'].swarm.connect(addrs['b'], function (err, res) {`
	`55`	`+ console.log('->', res)`
`54`	`56`	`if (err) {`
`55`	`57`	`throw err`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"b":"/ip4/127.0.0.1/tcp/52153","c":"/ip4/127.0.0.1/tcp/52166","a":"/ip4/127.0.0.1/tcp/52169"}`
	`1`	`+{"a":"/ip4/127.0.0.1/tcp/56689","b":"/ip4/127.0.0.1/tcp/56694","c":"/ip4/127.0.0.1/tcp/56697"}`