Merge branch 'master' into feat/modular-interface-tests

Author: alanshaw

test/name.spec.js

@@ -24,7 +24,7 @@ describe('.name', () => {
   let testFileCid
 
   before(function (done) {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     series([
       (cb) => {
@@ -44,18 +44,22 @@ describe('.name', () => {
         })
       },
       (cb) => {
-        ipfsd.api.id((err, id) => {
-          expect(err).to.not.exist()
-          const ma = id.addresses[0]
-          other.swarm.connect(ma, cb)
-        })
-      },
-      (cb) => {
-        ipfs.files.add(testfile, (err, res) => {
-          expect(err).to.not.exist()
-          testFileCid = res[0].hash
-          cb()
-        })
+        parallel([
+          (cb) => {
+            ipfs.id((err, id) => {
+              expect(err).to.not.exist()
+              const ma = id.addresses[0]
+              other.swarm.connect(ma, cb)
+            })
+          },
+          (cb) => {
+            ipfs.files.add(testfile, (err, res) => {
+              expect(err).to.not.exist()
+              testFileCid = res[0].hash
+              cb()
+            })
+          }
+        ], cb)
       }
     ], done)
   })

test/ping.spec.js

@@ -30,7 +30,7 @@ describe('.ping', function () {
   let otherId
 
   before(function (done) {
-    this.timeout(20 * 1000) // slow CI
+    this.timeout(30 * 1000) // slow CI
 
     series([
       (cb) => {
@@ -50,18 +50,22 @@ describe('.ping', function () {
         })
       },
       (cb) => {
-        ipfsd.api.id((err, id) => {
-          expect(err).to.not.exist()
-          const ma = id.addresses[0]
-          other.swarm.connect(ma, cb)
-        })
-      },
-      (cb) => {
-        other.id((err, id) => {
-          expect(err).to.not.exist()
-          otherId = id.id
-          cb()
-        })
+        parallel([
+          (cb) => {
+            ipfs.id((err, id) => {
+              expect(err).to.not.exist()
+              const ma = id.addresses[0]
+              other.swarm.connect(ma, cb)
+            })
+          },
+          (cb) => {
+            other.id((err, id) => {
+              expect(err).to.not.exist()
+              otherId = id.id
+              cb()
+            })
+          }
+        ], cb)
       }
     ], done)
   })