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

fix(test): close with timeout #54

Merged
merged 2 commits into from
Sep 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,8 @@
**/node_modules/
**/*.log
test/repo-tests*
package-lock.json

# Logs
logs
*.log

coverage

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

build

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

lib
docs
dist
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"coverage": "exit(0)",
"coverage-publish": "exit(0)"
},
"pre-commit": [
"pre-push": [
"lint"
],
"keywords": [
Expand Down
36 changes: 17 additions & 19 deletions src/listen-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ module.exports = (common) => {

it('close listener with connections, through timeout', async () => {
const upgradeSpy = sinon.spy(upgrader, 'upgradeInbound')
let finish
const done = new Promise((resolve) => {
finish = resolve
})

const listener = transport.createListener((conn) => {
expect(upgradeSpy.returned(conn)).to.equal(true)
Expand All @@ -64,21 +60,23 @@ module.exports = (common) => {
await listener.listen(addrs[0])

// Create two connections to the listener
const socket1 = await transport.dial(addrs[0])
await transport.dial(addrs[0])

pipe(
[Buffer.from('Some data that is never handled')],
socket1
).then(() => {
finish()
})

// Closer the listener (will take a couple of seconds to time out)
await listener.close()

// Pipe should have completed
await done
const [socket1] = await Promise.all([
transport.dial(addrs[0]),
transport.dial(addrs[0])
])

// Give the listener a chance to finish its upgrade
await new Promise(resolve => setTimeout(resolve, 0))

// Wait for the data send and close to finish
await Promise.all([
pipe(
[Buffer.from('Some data that is never handled')],
socket1
),
// Closer the listener (will take a couple of seconds to time out)
listener.close()
])

// 2 dials = 2 connections upgraded
expect(upgradeSpy.callCount).to.equal(2)
Expand Down