fix: daemon type in tests (#18)

* fix: daemon type in tests * fix: dont specify type twise
ipfs · Mar 19, 2018 · 2fbde7b · 2fbde7b
1 parent 9241cc7
commit 2fbde7b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/test/exchange-files.js b/test/exchange-files.js
@@ -5,6 +5,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+
 const series = require('async/series')
 const parallel = require('async/parallel')
 const waterfall = require('async/waterfall')
@@ -20,7 +21,8 @@ const hat = require('hat')
 const rmDir = promisify(rimraf)
 
 const DaemonFactory = require('ipfsd-ctl')
-const df = DaemonFactory.create()
+const goDf = DaemonFactory.create()
+const jsDf = DaemonFactory.create({ type: 'js' })
 
 function tmpDir () {
   return join(os.tmpdir(), `ipfs_${hat()}`)
@@ -57,9 +59,9 @@ describe('exchange files', () => {
     this.timeout(50 * 1000)
 
     parallel([
-      (cb) => df.spawn({ initOptions: { bits: 1024 } }, cb),
-      (cb) => df.spawn({ type: 'js', initOptions: { bits: 512 } }, cb),
-      (cb) => df.spawn({ type: 'js', initOptions: { bits: 512 } }, cb)
+      (cb) => goDf.spawn({ initOptions: { bits: 1024 } }, cb),
+      (cb) => jsDf.spawn({ initOptions: { bits: 512 } }, cb),
+      (cb) => jsDf.spawn({ initOptions: { bits: 512 } }, cb)
     ], (err, n) => {
       expect(err).to.not.exist()
       nodes = n

diff --git a/test/kad-dht.js b/test/kad-dht.js
@@ -5,14 +5,16 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+
 const series = require('async/series')
 const crypto = require('crypto')
 const parallel = require('async/parallel')
 const waterfall = require('async/waterfall')
 const bl = require('bl')
 
 const DaemonFactory = require('ipfsd-ctl')
-const df = DaemonFactory.create()
+const goDf = DaemonFactory.create()
+const jsDf = DaemonFactory.create({ type: 'js' })
 
 describe.skip('kad-dht', () => {
   describe('a JS node in the land of Go', () => {
@@ -23,10 +25,10 @@ describe.skip('kad-dht', () => {
 
     before((done) => {
       parallel([
-        (cb) => df.spawn({ initOptions: { bits: 1024 } }, cb),
-        (cb) => df.spawn({ initOptions: { bits: 1024 } }, cb),
-        (cb) => df.spawn({ initOptions: { bits: 1024 } }, cb),
-        (cb) => df.spawn({ type: 'js', initOptions: { bits: 512 } }, cb)
+        (cb) => goDf.spawn({ initOptions: { bits: 1024 } }, cb),
+        (cb) => goDf.spawn({ initOptions: { bits: 1024 } }, cb),
+        (cb) => goDf.spawn({ initOptions: { bits: 1024 } }, cb),
+        (cb) => jsDf.spawn({ initOptions: { bits: 512 } }, cb)
       ], (err, nodes) => {
         expect(err).to.not.exist()
         goD1 = nodes[0]

diff --git a/test/repo.js b/test/repo.js
@@ -13,7 +13,8 @@ const path = require('path')
 const hat = require('hat')
 
 const DaemonFactory = require('ipfsd-ctl')
-const df = DaemonFactory.create()
+const goDf = DaemonFactory.create()
+const jsDf = DaemonFactory.create({ type: 'js' })
 
 function catAndCheck (api, hash, data, callback) {
   api.cat(hash, (err, fileData) => {
@@ -35,7 +36,7 @@ describe('repo', () => {
 
     let hash
     series([
-      (cb) => df.spawn({
+      (cb) => goDf.spawn({
         repoPath: dir,
         disposable: false,
         initOptions: { bits: 1024 }
@@ -52,8 +53,7 @@ describe('repo', () => {
       }),
       (cb) => catAndCheck(goDaemon.api, hash, data, cb),
       (cb) => goDaemon.stop(cb),
-      (cb) => df.spawn({
-        type: 'js',
+      (cb) => jsDf.spawn({
         repoPath: dir,
         disposable: false,
         initOptions: { bits: 512 }
@@ -82,8 +82,7 @@ describe('repo', () => {
 
     let hash
     series([
-      (cb) => df.spawn({
-        type: 'js',
+      (cb) => jsDf.spawn({
         repoPath: dir,
         initOptions: { bits: 512 }
       }, cb),
@@ -97,7 +96,7 @@ describe('repo', () => {
         catAndCheck(jsDaemon.api, hash, data, cb)
       },
       (cb) => jsDaemon.stop(cb),
-      (cb) => df.spawn({
+      (cb) => goDf.spawn({
         repoPath: dir,
         initOptions: { bits: 1024 }
       }, cb),