fix: refactor missing pieces and await clean in bitswap tests

ipfs · Dec 11, 2019 · 186c886 · 186c886
1 parent b2dff1d
commit 186c886
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 81 deletions.
diff --git a/package.json b/package.json
@@ -160,7 +160,6 @@
     "multihashing-async": "^0.8.0",
     "node-fetch": "^2.3.0",
     "p-iteration": "^1.1.8",
-    "p-map": "^3.0.0",
     "p-queue": "^6.1.0",
     "peer-book": "^0.9.1",
     "peer-id": "~0.12.2",
@@ -213,6 +212,7 @@
     "lodash": "^4.17.15",
     "ncp": "^2.0.0",
     "p-event": "^4.1.0",
+    "p-map": "^3.0.0",
     "qs": "^6.5.2",
     "rimraf": "^3.0.0",
     "sinon": "^7.4.2",

diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
@@ -31,7 +31,7 @@ describe('bitswap', function () {
       const b = await remote.block.get(block.cid)
 
       expect(b.data).to.eql(block.data)
-      df.clean()
+      await df.clean()
     })
 
     it('3 peers', async () => {
@@ -55,7 +55,7 @@ describe('bitswap', function () {
         expect(await remote2.block.get(block.cid)).to.eql(block)
         expect(await proc.block.get(block.cid)).to.eql(block)
       }, { concurrency: 3 })
-      df.clean()
+      await df.clean()
     })
   })
 
@@ -71,7 +71,7 @@ describe('bitswap', function () {
       const files = await remote.add([{ path: 'awesome.txt', content: file }])
       const data = await proc.cat(files[0].hash)
       expect(data).to.eql(file)
-      df.clean()
+      await df.clean()
     })
   })
 
@@ -84,7 +84,7 @@ describe('bitswap', function () {
         expect(err).to.exist()
         expect(err.code).to.equal('ERR_INVALID_CID')
       } finally {
-        df.clean()
+        await df.clean()
       }
     })
   })

diff --git a/test/core/dht.spec.js b/test/core/dht.spec.js
@@ -45,11 +45,7 @@ describe.skip('dht', () => {
       ipfs = ipfsd.api
     })
 
-    after(() => {
-      if (ipfsd) {
-        return ipfsd.stop()
-      }
-    })
+    after(() => df.clean())
 
     describe('put', () => {
       it('should error when DHT not available', async () => {

diff --git a/test/core/name.spec.js b/test/core/name.spec.js
@@ -81,7 +81,6 @@ describe('name', function () {
 
   // TODO: unskip when DHT is enabled: https://github.com/ipfs/js-ipfs/pull/1994
   describe.skip('work with dht', () => {
-    let nodes
     let nodeA
     let nodeB
     let nodeC
@@ -115,7 +114,6 @@ describe('name', function () {
       ], (err, _nodes) => {
         expect(err).to.not.exist()
 
-        nodes = _nodes
         nodeA = _nodes[0].api
         nodeB = _nodes[1].api
         nodeC = _nodes[2].api
@@ -136,11 +134,7 @@ describe('name', function () {
       })
     })
 
-    after(function (done) {
-      this.timeout(80 * 1000)
-
-      parallel(nodes.map((node) => (cb) => node.stop(cb)), done)
-    })
+    after(() => df.clean())
 
     it('should publish and then resolve correctly with the default options', function (done) {
       this.timeout(380 * 1000)
@@ -175,32 +169,17 @@ describe('name', function () {
     before(async function () {
       this.timeout(40 * 1000)
       ipfsd = await df.spawn({
-        exec: IPFS,
-        args: ['--pass', hat()],
-        config: {
-          Bootstrap: [],
-          Discovery: {
-            MDNS: {
-              Enabled: false
-            },
-            webRTCStar: {
-              Enabled: false
-            }
-          }
-        },
-        preload: { enabled: false }
+        ipfsOptions: {
+          pass: hat()
+        }
       })
       node = ipfsd.api
 
       const res = await node.id()
       nodeId = res.id
     })
 
-    after(() => {
-      if (ipfsd) {
-        return ipfsd.stop()
-      }
-    })
+    after(() => df.clean())
 
     it('should error to publish if does not receive private key', function () {
       return expect(node._ipns.publisher.publish(null, ipfsRef))
@@ -322,32 +301,18 @@ describe('name', function () {
     before(async function () {
       this.timeout(40 * 1000)
       ipfsd = await df.spawn({
-        exec: IPFS,
-        args: ['--pass', hat(), '--offline'],
-        config: {
-          Bootstrap: [],
-          Discovery: {
-            MDNS: {
-              Enabled: false
-            },
-            webRTCStar: {
-              Enabled: false
-            }
-          }
-        },
-        preload: { enabled: false }
+        ipfsOptions: {
+          pass: hat(),
+          offline: true
+        }
       })
       node = ipfsd.api
 
       const res = await node.id()
       nodeId = res.id
     })
 
-    after(() => {
-      if (ipfsd) {
-        return ipfsd.stop()
-      }
-    })
+    after(() => df.clean())
 
     it('should resolve an ipfs path correctly', async function () {
       const res = await node.add(fixture)

diff --git a/test/core/pin.spec.js b/test/core/pin.spec.js
@@ -15,11 +15,7 @@ describe('pin', function () {
     ipfs = ipfsd.api
   })
 
-  after(() => {
-    if (ipfsd) {
-      return ipfsd.stop()
-    }
-  })
+  after(() => df.clean())
 
   describe('ls', () => {
     it('should callback with error for invalid non-string pin type option', (done) => {

diff --git a/test/core/ping.spec.js b/test/core/ping.spec.js
@@ -163,23 +163,7 @@ describe('ping', function () {
       })
     })
 
-    after(async () => {
-      if (ipfsdA) {
-        await ipfsdA.stop()
-      }
-    })
-
-    after(async () => {
-      if (ipfsdB) {
-        await ipfsdB.stop()
-      }
-    })
-
-    after(async () => {
-      if (ipfsdC) {
-        await ipfsdC.stop()
-      }
-    })
+    after(() => df.clean())
 
     it('if enabled uses the DHT peer routing to find peer', (done) => {
       let messageNum = 0

diff --git a/test/utils/on-and-off.js b/test/utils/on-and-off.js
@@ -63,10 +63,7 @@ function on (tests) {
 
     after(function () {
       resetLocaleToSystem()
-      if (ipfsd) {
-        this.timeout(15 * 1000)
-        return ipfsd.stop()
-      }
+      df.clean()
     })
 
     tests(thing)