(v6.x backport) test: refactor test-stream2-readable-wrap.js #11797

DavidGoussev · 2017-03-11T05:00:27Z

test: refactor test-stream2-readable-wrap.js

implement callback wrapper common.mustCall

remove process.on('exit') with callback wrapper common.mustCall

PR-URL: #11797
Backport-of: #10551

new year new alias PR-URL: nodejs#10586 Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Remove the numbers from the comments to make it clear that assert does not follow the [CJS spec](http://wiki.commonjs.org/wiki/Unit_Testing/1.0). Additionally, clean up the existing comments for consistent formatting/language and ease of reading. PR-URL: nodejs#10579 Fixes: nodejs#9063 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

PR-URL: nodejs#10446 Reviewed-By: James M Snell <[email protected]>

* use const instead of var * use common.mustCall to control functions execution * use assert.strictEqual instead of assert.equal * use arrow functions * remove console.error PR-URL: nodejs#10521 Reviewed-By: Prince John Wesley <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

We have had nodejs#9728 open for a while but the frequency of the failures seems to be such that we should mark it as flaky while we continue to investigate. PR-URL: nodejs#10618 Reviewed-by: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: James M Snell <[email protected]>

Fixes: nodejs/CTC#41 PR-URL: nodejs#10604 Fixes: https://github.com/nodejs/CTC#41 Reviewed-By: Evan Lucas <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Michal Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

* Change === to == in one place * Add explanation about another non-strict if-statement PR-URL: nodejs#11513 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Modify the `[Writable]` and `[Readable]` links so they point directly to the right sections in the stream.html doc PR-URL: nodejs#11517 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Add documentation for http clientRequest.aborted. PR-URL: nodejs#11544 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Communicate about leaked globals via `AssertionError` rather than `console.log()`. PR-URL: nodejs#11547 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>

Refs: nodejs#9399 PR-URL: nodejs#11548 Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Add a `test-addons-clean` to the Makefile to clean up files generated during testing addons. PR-URL: nodejs#11519 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Myles Borins <[email protected]>

Fixing a typo in comments, the word 'remaining' had a typo. PR-URL: nodejs#11503 Fixes: nodejs#11491 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

* Remove comment referring to the CommonJS Unit Testing 1.0 spec. This module is no longer intended to comply with that spec. * Remove puzzling "THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!" comment. No doubt, it made sense at one time. * Favor `===` over `==` in two places. PR-URL: nodejs#11511 Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

The intention of test case is to make sure that `timeout` property is honored and the code in context terminates and throws correct exception. However in test case, the code inside context would complete before `timeout` for windows and would sometimes fail. Updated the code so it guarantee to not complete execution until timeout is triggered. Fixes: nodejs#11261 PR-URL: nodejs#11530 Reviewed-By: James M Snell <jasnell.gmail.com> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Josh Gavant <[email protected]>

The IPC channel is referenced with the message event too. PR-URL: nodejs#11494 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

These two functions in the querystring are used as a fallback. To test them, two test cases were added which make errors that will be caught. PR-URL: nodejs#11326 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Currently the maximum number of tick is duplicated in two places. This commit introduces a constant that both can use. PR-URL: nodejs#11199 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Trevor Norris <[email protected]>

PR-URL: nodejs#11473 Ref: nodejs#11199 (comment) Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: nodejs#11482 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

This was semi-overlooked in nodejs#10236 because it always worked and didn’t need additional changes. Ref: nodejs#10236 PR-URL: nodejs#11486 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

PR-URL: nodejs#11377 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

If any tests leave processes running after testing results are complete, fail the test run. PR-URL: nodejs#11269 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Johan Bergström <[email protected]>

I noticed that the link to http-parser is pointing to the joyent organization. There is a redirect to the nodejs organization but perhaps this should be updated anyway. PR-URL: nodejs#11477 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Interpretation of escape sequences with echo is not as consistent across platforms as printf, so use the latter instead. PR-URL: nodejs#11466 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

PR-URL: nodejs#11454 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

`TLSSocket` should not have a hard dependency on `tls.Server`, since it may be running without it in cases like `STARTTLS`. Fix: nodejs#10704 PR-URL: nodejs#10706 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>

Refs: nodejs#11242 PR-URL: nodejs#11313 Reviewed-By: Brian White <[email protected]>

Also removes extraneous argument. PR-URL: nodejs#11413 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

Fixes: nodejs#9710 PR-URL: nodejs#11136 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

Creating an object in JS and using a typed array to transfer values from C++ to JS is faster than creating an object and setting properties in C++. The included benchmark shows ~34% increase in performance with this change. PR-URL: nodejs#11497 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

PR-URL: nodejs#11516 Reviewed-By: Jackson Tian <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

PR-URL: nodejs#11522 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Formatting changes for upcoming linter update. PR-URL: nodejs#10561 Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

We have been stalled on ESLint 3.8.0 for some time. Current ESLint is 3.13.0. We have been unable to upgrade because of more aggressive reporting on some rules, including indentation. ESLint configuration options and bugfixes are now such that we can reasonably upgrade. PR-URL: nodejs#10561 Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

ESLint `indent` rule now has options that duplicate functionality in our custom `align-function-arguments` rule. Remove `align-function-arguments` custom rule. PR-URL: nodejs#10561 Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

This adds an anchor for v6.10.0 in the LTS column. PR-URL: nodejs#11534 Reviewed-By: Evan Lucas <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

PR-URL: nodejs#11452 Refs: nodejs#11290 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

gibfahn · 2017-03-12T14:42:06Z

test/parallel/test-stream2-readable-wrap.js

-  console.log('ok');
-});
+const objectChunks = [ 5, 'a', false, 0, '', 'xyz', { x: 4 }, 7, [], 555 ];
+runTest(1, true, function() { return objectChunks.shift(); });


Could you add a newline at the end of the file? This errors if you run make lint.

/Users/gib/wrk/com/node/test/parallel/test-stream2-readable-wrap.js 71:63 error Newline required at end of file but not found eol-last ✖ 1 problem (1 error, 0 warnings)

DavidGoussev · 2017-03-13T00:58:13Z

test: add last line hard return

test: refactor test-stream2-readable-wrap.js

implement callback wrapper common.mustCall

remove process.on('exit') with callback wrapper common.mustCall

PR-URL: #11797
Backport-of: #10551

jasnell · 2017-03-22T17:19:09Z

Needs a rebase on the updated v6.x-staging branch

MylesBorins · 2017-04-13T19:27:13Z

@dpg5000 reminder that this needs a rebase

DavidGoussev · 2017-04-15T07:14:23Z

sorry for the delay, everyone. I believe i've got the requested rebase down (if not, please let me know)...

gibfahn · 2017-04-15T09:31:24Z

@dpg5000 I'm afraid it doesn't look rebased.

You want the commits to be 1.

Try this:

git fetch --all
git checkout v6.x-staging
git reset --hard upstream/v6.x-staging
git checkout backport-to-10551-v6.x
git status # Make sure you're up to date
git rebase v6.x-staging

When I do this on your branch I get:

➜  node git:(acd9bc315b) ✗ ❯ g s                                                      ~/wrk/com/node
rebase in progress; onto acd9bc315b
You are currently rebasing branch 'pr-11797' on 'acd9bc315b'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   test/parallel/test-stream2-readable-wrap.js

no changes added to commit (use "git add" and/or "git commit -a")

Then fix the conflicts by removing the >>>>/====/<<<< markers and the old code.

vim test/parallel/test-stream2-readable-wrap.js # Or whatever editor

Then add the file and continue the rebase:

git add test/parallel/test-stream2-readable-wrap.js
git rebase --continue

You can check that it worked with:

git log --graph --decorate --oneline # Graph log.

You should have one commit on top of v6.x-staging. Have a look at https://github.com/gibfahn/node/tree/pr-11797, it should be about right.

Use common.mustCall() where appropriate, var to const/let, assert.equal() -> assert.strictEqual(), explicit time provided to setTimeout() Backport-PR-URL: #11797 PR-URL: #10551 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>

MylesBorins · 2017-04-15T14:38:05Z

I went ahead and landed the backport commit on the head of v6.x-staging as 42d1fb1

Thanks for the work @dpg5000

DavidGoussev · 2017-04-15T15:15:00Z

Gibson, thank you so much for the information. I was missing a crucial step. Thanks again!

…

On Apr 15, 2017 2:32 AM, "Gibson Fahnestock" ***@***.***> wrote: @dpg5000 <https://github.com/dpg5000> I'm afraid it doesn't look rebased. [image: image] <https://cloud.githubusercontent.com/assets/15943089/25062477/0db7559a-21cd-11e7-8600-73a1dd9fcc85.png> You want the commits to be 1. Try this: git fetch --all git checkout v6.x-staging git reset --hard upstream/v6.x-staging git checkout backport-to-10551-v6.x git status # Make sure you're up to date git rebase v6.x-staging When I do this on your branch I get: ➜ node git:(acd9bc3) ✗ ❯ g s ~/wrk/com/node rebase in progress; onto acd9bc3 You are currently rebasing branch 'pr-11797' on 'acd9bc315b'. (fix conflicts and then run "git rebase --continue") (use "git rebase --skip" to skip this patch) (use "git rebase --abort" to check out the original branch) Unmerged paths: (use "git reset HEAD <file>..." to unstage) (use "git add <file>..." to mark resolution) both modified: test/parallel/test-stream2-readable-wrap.js no changes added to commit (use "git add" and/or "git commit -a") Then fix the conflicts by removing the >>>>/====/<<<< markers and the old code. vim test/parallel/test-stream2-readable-wrap.js # Or whatever editor Then add the file and continue the rebase: git add test/parallel/test-stream2-readable-wrap.js git rebase --continue You can check that it worked with: git log --graph --decorate --oneline # Graph log. [image: image] <https://cloud.githubusercontent.com/assets/15943089/25062578/d738d8ca-21ce-11e7-9a2f-47d11c1b94b7.png> You should have one commit on top of v6.x-staging. Have a look at https://github.com/gibfahn/node/tree/pr-11797, it should be about right. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#11797 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AMpemPjV9gg837B5yVhBElmgbBq0T0XSks5rwI6ygaJpZM4MaGWE> .

Use common.mustCall() where appropriate, var to const/let, assert.equal() -> assert.strictEqual(), explicit time provided to setTimeout() Backport-PR-URL: #11797 PR-URL: #10551 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>

Use common.mustCall() where appropriate, var to const/let, assert.equal() -> assert.strictEqual(), explicit time provided to setTimeout() Backport-PR-URL: nodejs/node#11797 PR-URL: nodejs/node#10551 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>

MylesBorins and others added 30 commits March 6, 2017 17:50

benchmark: improve readability of net benchmarks

0a07d2b

PR-URL: nodejs#10446 Reviewed-By: James M Snell <[email protected]>

net: prefer === to ==

40833a4

* Change === to == in one place * Add explanation about another non-strict if-statement PR-URL: nodejs#11513 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

lib: rename kMaxCallbacksUntilQueueIsShortened

9c4077d

PR-URL: nodejs#11473 Ref: nodejs#11199 (comment) Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

test: increase coverage of vm

64afb0b

PR-URL: nodejs#11377 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

tty: avoid oob warning in TTYWrap::GetWindowSize()

7c1d578

PR-URL: nodejs#11454 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

benchmark: add dgram bind(+/- params) benchmark

aaaa4c7

Refs: nodejs#11242 PR-URL: nodejs#11313 Reviewed-By: Brian White <[email protected]>

test: add regex check to test-module-loading

57f6d55

Also removes extraneous argument. PR-URL: nodejs#11413 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]>

doc: add comment for net.Server's error event

a98c1f6

Fixes: nodejs#9710 PR-URL: nodejs#11136 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

mscdex and others added 9 commits March 8, 2017 16:18

benchmark,lib,test: adjust for linting

1ad17f6

Formatting changes for upcoming linter update. PR-URL: nodejs#10561 Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>

doc: restrict the ES.Next features usage in tests

c2e818d

PR-URL: nodejs#11452 Refs: nodejs#11290 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>

test: refactor test-stream2-readable-wrap.js

94cd536

nodejs-github-bot added test Issues and PRs related to the tests. v6.x labels Mar 11, 2017

mscdex added the stream Issues and PRs related to the stream subsystem. label Mar 11, 2017

jasnell approved these changes Mar 12, 2017

View reviewed changes

gibfahn suggested changes Mar 12, 2017

View reviewed changes

gibfahn mentioned this pull request Mar 12, 2017

doc: add guide for backporting PRs #11099

Closed

2 tasks

test: add last line hard return

058b7b4

gibfahn approved these changes Mar 13, 2017

View reviewed changes

MylesBorins force-pushed the v6.x-staging branch from c2e818d to 426968d Compare March 21, 2017 21:27

MylesBorins force-pushed the v6.x-staging branch from 59b869e to 078188d Compare April 4, 2017 12:20

MylesBorins closed this Apr 15, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(v6.x backport) test: refactor test-stream2-readable-wrap.js #11797

(v6.x backport) test: refactor test-stream2-readable-wrap.js #11797

DavidGoussev commented Mar 11, 2017 •

edited

Loading

gibfahn Mar 12, 2017 •

edited

Loading

DavidGoussev commented Mar 13, 2017

jasnell commented Mar 22, 2017

MylesBorins commented Apr 13, 2017

DavidGoussev commented Apr 15, 2017

gibfahn commented Apr 15, 2017

MylesBorins commented Apr 15, 2017

DavidGoussev commented Apr 15, 2017 via email

(v6.x backport) test: refactor test-stream2-readable-wrap.js #11797

(v6.x backport) test: refactor test-stream2-readable-wrap.js #11797

Conversation

DavidGoussev commented Mar 11, 2017 • edited Loading

gibfahn Mar 12, 2017 • edited Loading

Choose a reason for hiding this comment

DavidGoussev commented Mar 13, 2017

jasnell commented Mar 22, 2017

MylesBorins commented Apr 13, 2017

DavidGoussev commented Apr 15, 2017

gibfahn commented Apr 15, 2017

MylesBorins commented Apr 15, 2017

DavidGoussev commented Apr 15, 2017 via email

DavidGoussev commented Mar 11, 2017 •

edited

Loading

gibfahn Mar 12, 2017 •

edited

Loading