Merge pull request #1226 from ipfs/fix-stats-tests

fix: stats tests
ipfs · Feb 17, 2018 · 698b5b6 · 698b5b6
2 parents 905bdc0 + caa9556
commit 698b5b6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
@@ -259,8 +259,11 @@ describe('bitswap', function () {
         expect(() => node.bitswap.wantlist()).to.throw(/online/)
       })
 
-      it('.stat throws while offline', () => {
-        expect(() => node.bitswap.stat()).to.throw(/online/)
+      it('.stat gives error while offline', () => {
+        node.bitswap.stat((err, stats) => {
+          expect(err).to.exist()
+          expect(stats).to.not.exist()
+        })
       })
 
       it('throws if offline', () => {
@@ -279,22 +282,22 @@ describe('bitswap', function () {
         expect(node.bitswap.wantlist()).to.eql([])
       })
 
-      it('returns the stats', () => {
-        let stats = node.bitswap.stat()
-
-        expect(stats).to.have.keys([
-          'blocksReceived',
-          'blocksSent',
-          'dataReceived',
-          'dataSent',
-          'wantListLength',
-          'wantlist',
-          'peerCount',
-          'peers',
-          'providesBufferLength',
-          'dupDataReceived',
-          'dupBlksReceived'
-        ])
+      it('returns the stats', (done) => {
+        node.bitswap.stat((err, stats) => {
+          expect(err).to.not.exist()
+          expect(stats).to.have.keys([
+            'blocksReceived',
+            'blocksSent',
+            'dataReceived',
+            'dataSent',
+            'wantlist',
+            'peers',
+            'provideBufLen',
+            'dupDataReceived',
+            'dupBlksReceived'
+          ])
+          done()
+        })
       })
     })
   })

diff --git a/test/http-api/spec/bitswap.js b/test/http-api/spec/bitswap.js
@@ -28,14 +28,15 @@ module.exports = (http) => {
         url: '/api/v0/bitswap/stat'
       }, (res) => {
         expect(res.statusCode).to.equal(200)
-
-        expect(res.result).to.have.keys([
-          'BlocksReceived',
-          'Wantlist',
-          'Peers',
-          'DupBlksReceived',
-          'DupDataReceived'
-        ])
+        expect(res.result).to.have.property('ProvideBufLen')
+        expect(res.result).to.have.property('BlocksReceived')
+        expect(res.result).to.have.property('Wantlist')
+        expect(res.result).to.have.property('Peers')
+        expect(res.result).to.have.property('DupBlksReceived')
+        expect(res.result).to.have.property('DupDataReceived')
+        expect(res.result).to.have.property('DataReceived')
+        expect(res.result).to.have.property('BlocksSent')
+        expect(res.result).to.have.property('DataSent')
         done()
       })
     })