fix: some fixes for incorrect tests

found these when debugging pull-multiplex
This commit is contained in:
Friedel Ziegelmayer 2017-01-11 21:57:37 +01:00
parent 4a0a05f9e6
commit 23a75d192e
4 changed files with 16 additions and 14 deletions

View File

@ -37,10 +37,8 @@
"multiaddr": "^2.1.0", "multiaddr": "^2.1.0",
"pull-generate": "^2.2.0", "pull-generate": "^2.2.0",
"pull-pair": "^1.1.0", "pull-pair": "^1.1.0",
"pull-stream": "^3.5.0", "pull-stream": "^3.5.0"
"run-parallel": "^1.1.6", },
"run-series": "^1.1.4"
},
"devDependencies": { "devDependencies": {
"aegir": "^9.3.0" "aegir": "^9.3.0"
}, },
@ -51,4 +49,4 @@
"Jeffrey Hulten <jhulten@gmail.com>", "Jeffrey Hulten <jhulten@gmail.com>",
"greenkeeperio-bot <support@greenkeeper.io>" "greenkeeperio-bot <support@greenkeeper.io>"
] ]
} }

View File

@ -107,11 +107,6 @@ module.exports = (common) => {
expect(err).to.not.exist.mark() expect(err).to.not.exist.mark()
}) })
pull(
pull.values(['hey']),
dialerConn
)
listener.on('stream', (stream) => { listener.on('stream', (stream) => {
pull( pull(
stream, stream,
@ -125,12 +120,13 @@ module.exports = (common) => {
expect(err).to.not.exist.mark() expect(err).to.not.exist.mark()
}) })
dialer.on('stream', onDialerStream)
pull( pull(
pull.values(['hello']), pull.values(['hello']),
listenerConn listenerConn
) )
dialer.on('stream', onDialerStream)
function onDialerStream (stream) { function onDialerStream (stream) {
pull( pull(
stream, stream,
@ -141,6 +137,11 @@ module.exports = (common) => {
) )
} }
}) })
pull(
pull.values(['hey']),
dialerConn
)
}) })
}) })
} }

View File

@ -7,8 +7,8 @@ chai.use(require('chai-checkmark'))
const expect = chai.expect const expect = chai.expect
const pair = require('pull-pair/duplex') const pair = require('pull-pair/duplex')
const pull = require('pull-stream') const pull = require('pull-stream')
const parallel = require('run-parallel') const parallel = require('async/parallel')
const series = require('run-series') const series = require('async/series')
const Tcp = require('libp2p-tcp') const Tcp = require('libp2p-tcp')
const multiaddr = require('multiaddr') const multiaddr = require('multiaddr')

View File

@ -7,6 +7,7 @@ const pull = require('pull-stream')
const generate = require('pull-generate') const generate = require('pull-generate')
const each = require('async/each') const each = require('async/each')
const eachLimit = require('async/eachLimit') const eachLimit = require('async/eachLimit')
const setImmediate = require('async/setImmediate')
module.exports = (muxer, nStreams, nMsg, done, limit) => { module.exports = (muxer, nStreams, nMsg, done, limit) => {
const p = pair() const p = pair()
@ -50,7 +51,9 @@ module.exports = (muxer, nStreams, nMsg, done, limit) => {
check() check()
pull( pull(
generate(0, (s, cb) => { generate(0, (s, cb) => {
cb(s === nMsg ? true : null, msg, s + 1) setImmediate(() => {
cb(s === nMsg ? true : null, msg, s + 1)
})
}), }),
stream, stream,
pull.collect((err, res) => { pull.collect((err, res) => {