From b161a36c38251d68892a388df514ac1f20c17e47 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Thu, 6 Sep 2018 11:01:21 +0100 Subject: [PATCH] chore: appease linter License: MIT Signed-off-by: Alan Shaw --- test/bootstrapers.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/bootstrapers.js b/test/bootstrapers.js index e806c42cdb..afc3b7fc0c 100644 --- a/test/bootstrapers.js +++ b/test/bootstrapers.js @@ -40,11 +40,7 @@ describe('Check that a js-ipfs node can indeed contact the bootstrappers', () => it('a node connects to bootstrappers', function (done) { this.timeout(2 * 60 * 1000) -<<<<<<< HEAD const test = (cb) => { -======= - waitFor((cb) => { ->>>>>>> chore: cleanup temp repos after tests ipfsd.api.swarm.peers((err, peers) => { if (err) return cb(err) @@ -56,12 +52,8 @@ describe('Check that a js-ipfs node can indeed contact the bootstrappers', () => cb(null, bootstrapList.every(addr => peerList.includes(addr))) }) -<<<<<<< HEAD } waitFor(test, { name: 'connect to all bootstrap nodes', timeout: 60 * 1000 }, done) -======= - }, { name: 'connect to all bootstrap nodes', timeout: 60 * 1000 }, done) ->>>>>>> chore: cleanup temp repos after tests }) })