-
-
Notifications
You must be signed in to change notification settings - Fork 232
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(test): Use finished
to check streams
#462
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3c01e78
refactor: Use `finished` to check streams
fb55 459094c
Provide own `finished` fn
fb55 b236db5
Use readFile promise
fb55 abd3e85
Revert ParserStream update
fb55 87207bb
Revert "Use readFile promise"
fb55 21c70e5
Remove `promisify-event`
fb55 b58adf0
Merge branch 'master' into finished
fb55 d9eea7c
Initialise vars when needed
fb55 1d060d4
Merge branch 'master' into finished
fb55 bdd2582
Update package-lock.json
fb55 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ import { treeAdapters, WritableStreamStub } from 'parse5-test-utils/dist/common. | |
import * as parse5 from '../../packages/parse5/dist/index.js'; | ||
import { ParserStream as parse5Stream } from '../../packages/parse5-parser-stream/dist/index.js'; | ||
import * as parse5Upstream from 'parse5'; | ||
import { finished } from 'node:stream/promises'; | ||
|
||
const hugePagePath = new URL('../../test/data/huge-page/huge-page.html', import.meta.url); | ||
const treeConstructionPath = new URL('../../test/data/html5lib-tests/tree-construction', import.meta.url); | ||
|
@@ -21,7 +22,7 @@ global.upstreamParser = parse5Upstream; | |
global.hugePage = readFileSync(hugePagePath).toString(); | ||
|
||
// Micro data | ||
global.microTests = loadTreeConstructionTestData([treeConstructionPath], treeAdapters.default) | ||
global.microTests = loadTreeConstructionTestData(treeConstructionPath, treeAdapters.default) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
.filter( | ||
(test) => | ||
//NOTE: this test caused a stack overflow in parse5 v1.x | ||
|
@@ -107,35 +108,28 @@ runBench({ | |
name: 'parse5 regression benchmark - STREAM', | ||
defer: true, | ||
workingCopyFn: async (deferred) => { | ||
const parsePromises = files.map( | ||
(fileName) => | ||
new Promise((resolve) => { | ||
const stream = createReadStream(fileName, 'utf8'); | ||
const parserStream = new WorkingCopyParserStream(); | ||
const parsePromises = files.map((fileName) => { | ||
const stream = createReadStream(fileName, 'utf8'); | ||
const parserStream = new WorkingCopyParserStream(); | ||
|
||
stream.pipe(parserStream); | ||
parserStream.on('finish', resolve); | ||
}) | ||
); | ||
stream.pipe(parserStream); | ||
return finished(parserStream); | ||
}); | ||
|
||
await Promise.all(parsePromises); | ||
deferred.resolve(); | ||
}, | ||
upstreamFn: async (deferred) => { | ||
const parsePromises = files.map( | ||
(fileName) => | ||
new Promise((resolve) => { | ||
const stream = createReadStream(fileName, 'utf8'); | ||
const writable = new WritableStreamStub(); | ||
|
||
writable.on('finish', () => { | ||
upstreamParser.parse(writable.writtenData); | ||
resolve(); | ||
}); | ||
|
||
stream.pipe(writable); | ||
}) | ||
); | ||
const parsePromises = files.map(async (fileName) => { | ||
const stream = createReadStream(fileName, 'utf8'); | ||
const writable = new WritableStreamStub(); | ||
|
||
stream.pipe(writable); | ||
|
||
await finished(writable); | ||
|
||
upstreamParser.parse(writable.writtenData); | ||
}); | ||
|
||
await Promise.all(parsePromises); | ||
deferred.resolve(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This event was updated to use the promise constructor, which allowed us to get rid of
promisify-event
.