fix: test & cleanup

Author: dryajov

src/daemon.js

@@ -14,7 +14,7 @@ const isWindows = os.platform() === 'win32'
 
 const exec = require('./exec')
 
-const GRACE_PERIOD = 7500 // amount of ms to wait before sigkill
+const GRACE_PERIOD = 10500 // amount of ms to wait before sigkill
 
 function findIpfsExecutable (isJs, rootPath) {
   let appRoot = path.join(rootPath, '..')
@@ -91,11 +91,12 @@ class Node {
    */
   constructor (path, opts, disposable) {
     const rootPath = process.env.testpath ? process.env.testpath : __dirname
-    const isJS = process.env.IPFS_JS && process.env.IPFS_JS === 'true'
+    const isJS = process.env.IPFS_JS && process.env.IPFS_JS === 'true' // TODO: handle proper truthy/falsy
+
+    this.opts = opts || { isJs: isJS || false }
+    process.env.IPFS_JS = this.opts.isJs
 
     this.path = path || null
-    this.opts = opts || { isJs: false }
-    this.isJs = this.opts.isJs || isJS || false
     this.exec = process.env.IPFS_EXEC || findIpfsExecutable(this.isJs, rootPath)
     this.subprocess = null
     this.initialized = fs.existsSync(path)
@@ -237,7 +238,7 @@ class Node {
             .filter(Boolean)
             .slice(-1)[0] || ''
 
-          if (input.match('daemon is running')) {
+          if (input.match(/(?:daemon is running|Daemon is ready)/)) {
             // we're good
             return callback(null, this.api)
           }
@@ -254,7 +255,7 @@ class Node {
             : true
 
           const gwMatch = want.gateway
-            ? output.trim().match(/Gateway (?:.*)? 27listening on[:]?(.*)/)
+            ? output.trim().match(/Gateway (?:.*) listening on[:]?(.*)/)
             : true
 
           if (apiMatch && gwMatch && !returned) {
@@ -268,7 +269,7 @@ class Node {
             }
 
             if (want.gateway) {
-              this._gatewayAddr = multiaddr(gwMatch[2])
+              this._gatewayAddr = multiaddr(gwMatch[1])
               this.api.gatewayHost = this.gatewayAddr.nodeAddress().address
               this.api.gatewayPort = this.gatewayAddr.nodeAddress().port
             }

test/spawning-go-daemons.spec.js renamed to test/spawning-daemons.spec.js

@@ -20,6 +20,10 @@ const ipfsd = require('../src')
 
 const isWindows = os.platform() === 'win32'
 
+const VERSION_STRING = process.env.IPFS_JS ? 'js-ipfs version: 0.26.0' : 'ipfs version 0.4.11'
+const API_PORT = process.env.IPFS_JS ? '5002' : '5001'
+const GW_PORT = process.env.IPFS_JS ? '9090' : '8080'
+
 describe('daemon spawning', () => {
   describe('local daemon', () => {
     const repoPath = '/tmp/ipfsd-ctl-test'
@@ -291,11 +295,15 @@ describe('daemon spawning', () => {
       })
     })
 
-    it('should give an error if setting an invalid config value', (done) => {
-      ipfsNode.setConfig('Bootstrap', 'true', (err) => {
-        expect(err.message).to.match(/failed to set config value/)
-        done()
-      })
+    it('should give an error if setting an invalid config value', function (done) {
+      if (!process.env.IPFS_JS) { // TODO: handle proper truthy/falsy
+        ipfsNode.setConfig('Bootstrap', 'true', (err) => {
+          expect(err.message).to.match(/failed to set config value/)
+          done()
+        })
+      } else {
+        this.skip()
+      }
     })
   })
 
@@ -313,7 +321,7 @@ describe('daemon spawning', () => {
   it('prints the version', (done) => {
     ipfsd.version((err, version) => {
       expect(err).to.not.exist()
-      expect(version).to.be.eql('ipfs version 0.4.11')
+      expect(version).to.be.eql(VERSION_STRING)
       done()
     })
   })
@@ -378,7 +386,8 @@ describe('daemon spawning', () => {
   })
 
   describe('startDaemon', () => {
-    it('start and stop', (done) => {
+    it('start and stop', function (done) {
+      this.timeout(20000)
       const dir = `${os.tmpdir()}/tmp-${Date.now() + '-' + Math.random().toString(36)}`
 
       const check = (cb) => {
@@ -412,7 +421,9 @@ describe('daemon spawning', () => {
       ], done)
     })
 
-    it('starts the daemon and returns valid API and gateway addresses', (done) => {
+    it('starts the daemon and returns valid API and gateway addresses', function (done) {
+      this.timeout(20000)
+
       const dir = `${os.tmpdir()}/tmp-${Date.now() + '-' + Math.random().toString(36)}`
 
       async.waterfall([
@@ -436,26 +447,30 @@ describe('daemon spawning', () => {
         expect(api).to.have.property('gatewayHost')
         expect(api).to.have.property('gatewayPort')
         expect(api.apiHost).to.equal('127.0.0.1')
-        expect(api.apiPort).to.equal('5001')
+        console.log(API_PORT)
+        expect(api.apiPort).to.equal(API_PORT)
         expect(api.gatewayHost).to.equal('127.0.0.1')
-        expect(api.gatewayPort).to.equal('8080')
+        expect(api.gatewayPort).to.equal(GW_PORT)
 
         daemon.stopDaemon(done)
       })
     })
 
-    it('allows passing flags', (done) => {
-      ipfsd.disposable((err, node) => {
-        expect(err).to.not.exist()
-
-        node.startDaemon(['--should-not-exist'], (err) => {
-          expect(err).to.exist()
-          expect(err.message)
-            .to.match(/Unrecognized option 'should-not-exist'/)
+    it('allows passing flags', function (done) {
+      if (!process.env.IPFS_JS) {
+        ipfsd.disposable((err, node) => {
+          expect(err).to.not.exist()
+          node.startDaemon(['--should-not-exist'], (err) => {
+            expect(err).to.exist()
+            expect(err.message)
+              .to.match(/Unrecognized option 'should-not-exist'/)
 
-          done()
+            done()
+          })
         })
-      })
+      } else {
+        this.skip()
+      }
     })
   })
 })