Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit 533760f

Browse files
committed
fix: do not fail stop node if failed start node
License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>
1 parent faa51b4 commit 533760f

16 files changed

+72
-18
lines changed

Diff for: test/bitswap.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ describe('.bitswap', function () {
2727
})
2828
})
2929

30-
after((done) => ipfsd.stop(done))
30+
after((done) => {
31+
if (!ipfsd) return done()
32+
ipfsd.stop(done)
33+
})
3134

3235
it('.wantlist', (done) => {
3336
ipfs.bitswap.wantlist((err, res) => {

Diff for: test/commands.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ describe('.commands', function () {
2525
})
2626
})
2727

28-
after((done) => ipfsd.stop(done))
28+
after((done) => {
29+
if (!ipfsd) return done()
30+
ipfsd.stop(done)
31+
})
2932

3033
it('lists commands', (done) => {
3134
ipfs.commands((err, res) => {

Diff for: test/constructor.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ describe('ipfs-api constructor tests', () => {
3535
})
3636
})
3737

38-
after((done) => ipfsd.stop(done))
38+
after((done) => {
39+
if (!ipfsd) return done()
40+
ipfsd.stop(done)
41+
})
3942

4043
it('opts', (done) => {
4144
const splitted = apiAddr.split('/')

Diff for: test/diag.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ describe('.diag', function () {
2828
})
2929
})
3030

31-
after((done) => ipfsd.stop(done))
31+
after((done) => {
32+
if (!ipfsd) return done()
33+
ipfsd.stop(done)
34+
})
3235

3336
describe('Callback API', () => {
3437
// Disabled in go-ipfs 0.4.10

Diff for: test/files.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ describe('.files (the MFS API part)', function () {
4747
})
4848
})
4949

50-
after((done) => ipfsd.stop(done))
50+
after((done) => {
51+
if (!ipfsd) return done()
52+
ipfsd.stop(done)
53+
})
5154

5255
it('add file for testing', (done) => {
5356
ipfs.files.add(testfile, (err, res) => {

Diff for: test/get.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ describe('.get (specific go-ipfs features)', function () {
4141
], done)
4242
})
4343

44-
after((done) => ipfsd.stop(done))
44+
after((done) => {
45+
if (!ipfsd) return done()
46+
ipfsd.stop(done)
47+
})
4548

4649
it('no compression args', (done) => {
4750
ipfs.get(smallFile.cid, (err, files) => {

Diff for: test/key.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ describe('.key', function () {
2525
})
2626
})
2727

28-
after((done) => ipfsd.stop(done))
28+
after((done) => {
29+
if (!ipfsd) return done()
30+
ipfsd.stop(done)
31+
})
2932

3033
describe('Callback API', () => {
3134
describe('.gen', () => {

Diff for: test/log.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ describe('.log', function () {
2525
})
2626
})
2727

28-
after((done) => ipfsd.stop(done))
28+
after((done) => {
29+
if (!ipfsd) return done()
30+
ipfsd.stop(done)
31+
})
2932

3033
it('.log.tail', (done) => {
3134
const req = ipfs.log.tail((err, res) => {

Diff for: test/name.spec.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,14 @@ describe('.name', () => {
6262

6363
after((done) => {
6464
parallel([
65-
(cb) => ipfsd.stop(cb),
66-
(cb) => otherd.stop(cb)
65+
(cb) => {
66+
if (!ipfsd) return cb()
67+
ipfsd.stop(cb)
68+
},
69+
(cb) => {
70+
if (!otherd) return cb()
71+
otherd.stop(cb)
72+
}
6773
], done)
6874
})
6975

Diff for: test/ping.spec.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,14 @@ describe('.ping', function () {
6060

6161
after((done) => {
6262
parallel([
63-
(cb) => ipfsd.stop(cb),
64-
(cb) => otherd.stop(cb)
63+
(cb) => {
64+
if (!ipfsd) return cb()
65+
ipfsd.stop(cb)
66+
},
67+
(cb) => {
68+
if (!otherd) return cb()
69+
otherd.stop(cb)
70+
}
6571
], done)
6672
})
6773

Diff for: test/pubsub-in-browser.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ describe('.pubsub is not supported in the browser, yet!', function () {
5555
})
5656
})
5757

58-
after((done) => ipfsd.stop(done))
58+
after((done) => {
59+
if (!ipfsd) return done()
60+
ipfsd.stop(done)
61+
})
5962

6063
describe('everything errors', () => {
6164
describe('Callback API', () => {

Diff for: test/refs.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ describe('.refs', function () {
4949
], done)
5050
})
5151

52-
after((done) => ipfsd.stop(done))
52+
after((done) => {
53+
if (!ipfsd) return done()
54+
ipfsd.stop(done)
55+
})
5356

5457
const result = [
5558
{

Diff for: test/repo.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ describe('.repo', function () {
2424
})
2525
})
2626

27-
after((done) => ipfsd.stop(done))
27+
after((done) => {
28+
if (!ipfsd) return done()
29+
ipfsd.stop(done)
30+
})
2831

2932
it('.repo.gc', (done) => {
3033
ipfs.repo.gc((err, res) => {

Diff for: test/stats.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ describe('stats', function () {
2424
})
2525
})
2626

27-
after((done) => ipfsd.stop(done))
27+
after((done) => {
28+
if (!ipfsd) return done()
29+
ipfsd.stop(done)
30+
})
2831

2932
it('.stats.bitswap', (done) => {
3033
ipfs.stats.bitswap((err, res) => {

Diff for: test/types.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ describe('.types', function () {
3434
})
3535
})
3636

37-
after((done) => ipfsd.stop(done))
37+
after((done) => {
38+
if (!ipfsd) return done()
39+
ipfsd.stop(done)
40+
})
3841

3942
it('types object', () => {
4043
expect(ipfs.types).to.be.deep.equal({

Diff for: test/util.spec.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ describe('.util', () => {
3232
})
3333
})
3434

35-
after((done) => ipfsd.stop(done))
35+
after((done) => {
36+
if (!ipfsd) return done()
37+
ipfsd.stop(done)
38+
})
3639

3740
it('.streamAdd', (done) => {
3841
const tfpath = path.join(__dirname, '/fixtures/testfile.txt')

0 commit comments

Comments
 (0)