chore: make Travis a little bit more happy (#1109)

* wip

* refactor bitswap tests

* travis, you can do it!

* bora lá

* last mile

* one more time

* another round

* one more time

Author: daviddias

package.json

@@ -75,7 +75,7 @@
     "expose-loader": "^0.7.4",
     "form-data": "^2.3.1",
     "hat": "0.0.3",
-    "interface-ipfs-core": "~0.36.8",
+    "interface-ipfs-core": "~0.36.11",
     "ipfsd-ctl": "~0.25.1",
     "left-pad": "^1.2.0",
     "lodash": "^4.17.4",

test/cli/files.js

@@ -107,7 +107,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add with progress', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add -p src/init-files/init-docs/readme')
       .then((out) => {
@@ -117,7 +117,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add src/init-files/init-docs/readme')
       .then((out) => {
@@ -127,7 +127,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add alias', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('add src/init-files/init-docs/readme')
       .then((out) => {
@@ -137,7 +137,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add recursively test', function () {
-    this.timeout(20 * 1000)
+    this.timeout(60 * 1000)
 
     return ipfs('files add -r test/fixtures/test-data/recursive-get-dir')
       .then((out) => {
@@ -146,7 +146,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add directory with trailing slash test', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add -r test/fixtures/test-data/recursive-get-dir/')
       .then((out) => {
@@ -155,7 +155,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add and wrap with a directory', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('add -w src/init-files/init-docs/readme').then((out) => {
       expect(out).to.be.eql([
@@ -166,7 +166,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add with cid-version=0', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('add src/init-files/init-docs/readme --cid-version=0').then((out) => {
       expect(out)
@@ -184,7 +184,7 @@ describe('files', () => runOnAndOff((thing) => {
   //
   // This retains feature parity without having to implement raw-leaves.
   it('add with cid-version=1', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return new Promise((resolve, reject) => {
       ipfs('add src/init-files/init-docs/readme --cid-version=1')
@@ -214,7 +214,7 @@ describe('files', () => runOnAndOff((thing) => {
   //
   // This retains feature parity without having to implement raw-leaves.
   it('add with cid-version=1 and raw-leaves=true', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return new Promise((resolve, reject) => {
       ipfs('add src/init-files/init-docs/readme --cid-version=1 --raw-leaves=true')
@@ -227,7 +227,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add --quiet', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add -q src/init-files/init-docs/readme')
       .then((out) => {
@@ -237,7 +237,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add --quieter', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add -Q -w test/fixtures/test-data/hello test/test-data/node.json')
       .then((out) => {
@@ -247,7 +247,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('add --silent', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files add --silent src/init-files/init-docs/readme')
       .then((out) => {
@@ -257,7 +257,7 @@ describe('files', () => runOnAndOff((thing) => {
   })
 
   it('cat', function () {
-    this.timeout(20 * 1000)
+    this.timeout(30 * 1000)
 
     return ipfs('files cat QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
       .then((out) => {

test/cli/id.js

@@ -8,12 +8,12 @@ describe('id', () => runOnAndOff((thing) => {
   let ipfs
 
   before(function () {
-    this.timeout(40 * 1000)
+    this.timeout(60 * 1000)
     ipfs = thing.ipfs
   })
 
   it('get the id', function () {
-    this.timeout(40 * 1000)
+    this.timeout(60 * 1000)
 
     return ipfs('id').then((res) => {
       const id = JSON.parse(res)

test/cli/pubsub.js

@@ -26,7 +26,7 @@ describe('pubsub', function () {
   const topicC = 'nonscentsC'
 
   before(function (done) {
-    this.timeout(40 * 1000)
+    this.timeout(60 * 1000)
 
     instanceFactory = new InstanceFactory()
     instanceFactory.spawnNode((err, _node) => {
@@ -73,7 +73,7 @@ describe('pubsub', function () {
   })
 
   it('ls', function () {
-    this.timeout(40 * 1000)
+    this.timeout(80 * 1000)
 
     const sub = cli(`pubsub sub ${topicB}`)
 
@@ -108,32 +108,31 @@ describe('pubsub', function () {
         })
     }
 
-    series(
-      [
-        (cb) => httpApi.id((err, peerInfo) => {
-          expect(err).to.not.exist()
-          peerAddress = peerInfo.addresses[0]
-          expect(peerAddress).to.exist()
-          cb()
-        }),
-        (cb) => node.id((err, peerInfo) => {
-          expect(err).to.not.exist()
-          instancePeerId = peerInfo.id.toString()
-          cb()
-        }),
-        (cb) => node.swarm.connect(peerAddress, cb),
-        (cb) => node.pubsub.subscribe(topicC, handler, cb)
-      ],
-      (err) => {
+    series([
+      (cb) => httpApi.id((err, peerInfo) => {
         expect(err).to.not.exist()
-        sub = cli(`pubsub sub ${topicC}`)
-
-        return Promise.all([
-          sub.catch(ignoreKill),
-          delay(1000)
-            .then(() => cli(`pubsub pub ${topicC} world`))
-        ])
-      })
+        peerAddress = peerInfo.addresses[0]
+        expect(peerAddress).to.exist()
+        cb()
+      }),
+      (cb) => node.id((err, peerInfo) => {
+        expect(err).to.not.exist()
+        instancePeerId = peerInfo.id.toString()
+        cb()
+      }),
+      (cb) => node.swarm.connect(peerAddress, cb),
+      (cb) => node.pubsub.subscribe(topicC, handler, cb)
+    ],
+    (err) => {
+      expect(err).to.not.exist()
+      sub = cli(`pubsub sub ${topicC}`)
+
+      return Promise.all([
+        sub.catch(ignoreKill),
+        delay(1000)
+          .then(() => cli(`pubsub pub ${topicC} world`))
+      ])
+    })
   })
 })
 

test/cli/swarm.js

@@ -18,7 +18,7 @@ describe('swarm', () => {
   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)
+    this.timeout(80 * 1000)
 
     factory = new Factory()
 
@@ -46,7 +46,7 @@ describe('swarm', () => {
   after((done) => factory.dismantle(done))
 
   describe('daemon on (through http-api)', function () {
-    this.timeout(40 * 1000)
+    this.timeout(60 * 1000)
 
     it('connect', () => {
       return ipfsA('swarm', 'connect', bMultiaddr).then((out) => {