fix: new setup

src/miscellaneous/id.js

@@ -8,13 +8,13 @@ module.exports = (createCommon, options) => {
   const it = getIt(options)
   const common = createCommon()
 
-  describe('.id', () => {
+  describe('.id', function () {
+    this.timeout(60 * 1000)
     let ipfs
 
     before(function (done) {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
-      this.timeout(60 * 1000)
 
       common.setup((err, factory) => {
         expect(err).to.not.exist()

src/miscellaneous/resolve.js

@@ -15,7 +15,8 @@ module.exports = (createCommon, options) => {
   const it = getIt(options)
   const common = createCommon()
 
-  describe('.resolve', () => {
+  describe('.resolve', function () {
+    this.timeout(60 * 1000)
     let ipfs
     let nodeId
 

src/swarm/connect.js

@@ -1,38 +1,24 @@
 /* eslint-env mocha */
 'use strict'
 
-const { spawnNodesWithId } = require('../utils/spawn')
-const { getDescribe, getIt, expect } = require('../utils/mocha')
+const { getDescribe, getIt } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
   const it = getIt(options)
   const common = createCommon()
 
   describe('.swarm.connect', function () {
-    this.timeout(80 * 1000)
-
+    this.timeout(10000)
     let ipfsA
     let ipfsB
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon, so we need to increase the
-      // timeout for the before step
-      this.timeout(100 * 1000)
-
-      common.setup((err, factory) => {
-        expect(err).to.not.exist()
-
-        spawnNodesWithId(2, factory, (err, nodes) => {
-          expect(err).to.not.exist()
-          ipfsA = nodes[0]
-          ipfsB = nodes[1]
-          done()
-        })
-      })
+    before(async () => {
+      ipfsA = await common.setup()
+      ipfsB = await common.setup()
     })
 
-    after((done) => common.teardown(done))
+    after(() => common.teardown())
 
     it('should connect to a peer', (done) => {
       ipfsA.swarm.connect(ipfsB.peerId.addresses[0], done)