Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Commit 23a75d1

Browse files
fix: some fixes for incorrect tests
found these when debugging pull-multiplex
1 parent 4a0a05f commit 23a75d1

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@
3737
"multiaddr": "^2.1.0",
3838
"pull-generate": "^2.2.0",
3939
"pull-pair": "^1.1.0",
40-
"pull-stream": "^3.5.0",
41-
"run-parallel": "^1.1.6",
42-
"run-series": "^1.1.4"
43-
},
40+
"pull-stream": "^3.5.0"
41+
},
4442
"devDependencies": {
4543
"aegir": "^9.3.0"
4644
},
@@ -51,4 +49,4 @@
5149
"Jeffrey Hulten <[email protected]>",
5250
"greenkeeperio-bot <[email protected]>"
5351
]
54-
}
52+
}

src/base-test.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ module.exports = (common) => {
107107
expect(err).to.not.exist.mark()
108108
})
109109

110-
pull(
111-
pull.values(['hey']),
112-
dialerConn
113-
)
114-
115110
listener.on('stream', (stream) => {
116111
pull(
117112
stream,
@@ -125,12 +120,13 @@ module.exports = (common) => {
125120
expect(err).to.not.exist.mark()
126121
})
127122

123+
dialer.on('stream', onDialerStream)
124+
128125
pull(
129126
pull.values(['hello']),
130127
listenerConn
131128
)
132129

133-
dialer.on('stream', onDialerStream)
134130
function onDialerStream (stream) {
135131
pull(
136132
stream,
@@ -141,6 +137,11 @@ module.exports = (common) => {
141137
)
142138
}
143139
})
140+
141+
pull(
142+
pull.values(['hey']),
143+
dialerConn
144+
)
144145
})
145146
})
146147
}

src/close-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ chai.use(require('chai-checkmark'))
77
const expect = chai.expect
88
const pair = require('pull-pair/duplex')
99
const pull = require('pull-stream')
10-
const parallel = require('run-parallel')
11-
const series = require('run-series')
10+
const parallel = require('async/parallel')
11+
const series = require('async/series')
1212
const Tcp = require('libp2p-tcp')
1313
const multiaddr = require('multiaddr')
1414

src/spawner.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const pull = require('pull-stream')
77
const generate = require('pull-generate')
88
const each = require('async/each')
99
const eachLimit = require('async/eachLimit')
10+
const setImmediate = require('async/setImmediate')
1011

1112
module.exports = (muxer, nStreams, nMsg, done, limit) => {
1213
const p = pair()
@@ -50,7 +51,9 @@ module.exports = (muxer, nStreams, nMsg, done, limit) => {
5051
check()
5152
pull(
5253
generate(0, (s, cb) => {
53-
cb(s === nMsg ? true : null, msg, s + 1)
54+
setImmediate(() => {
55+
cb(s === nMsg ? true : null, msg, s + 1)
56+
})
5457
}),
5558
stream,
5659
pull.collect((err, res) => {

0 commit comments

Comments
 (0)