FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix cctest by addaleax · Pull Request #14749 · nodejs/node · GitHub

/ node Public

Fix cctest - #14749

Closed
addaleax wants to merge 4 commits into
nodejs:masterfrom
addaleax:fix-cctest
ConversationCommits (4)ChecksFiles changed
Closed

Fix cctest#14749
addaleax wants to merge 4 commits into
nodejs:masterfrom
addaleax:fix-cctest

Conversation

addaleax commented Aug 10, 2017

Copy link
Copy Markdown
Member

Fixes: #14206

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

src/env, test

src: add overlooked handle to cleanup
5a0ee6d 
The `Environment::destroy_ids_timer_handle` should be cleaned up
by `Environment::CleanupHandles()`. Fix that by adding it to the list.

This partially fixes a cctest.

Ref: nodejs#14206
test: properly order freeing resources in cctest
682a951 
The `IsolateData` instance is created before the `Environment` instance,
so free in reverse order.

Fixes: nodejs#14206
Revert "test: add DISABLED_ prefix to commented out test"
3f95be9 
This reverts commit 75bf8a9.

Ref: nodejs#14206
Ref: nodejs#14317
Revert "test: disable MultipleEnvironmentsPerIsolate"
557eb7b 
This reverts commit 95ab966.

Ref: nodejs#14206
Ref: nodejs#14246
nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Aug 10, 2017
addaleax mentioned this pull request Aug 10, 2017
Closed

addaleax commented Aug 10, 2017

Copy link
Copy Markdown
Member Author

I couldn’t reproduce the crash locally, but we’ve had this issue before with the same symptoms, and valgrind went from complaining to not complaining, so I’m feeling very confident that this is sufficient.

CI: https://ci.nodejs.org/job/node-test-commit/11693/

addaleax requested a review from danbev August 10, 2017 18:59
addaleax commented Aug 10, 2017
View reviewed changes
Comment thread src/env.cc
RegisterHandleCleanup(
reinterpret_cast<uv_handle_t*>(&destroy_ids_timer_handle_),
close_and_finish,
nullptr);

addaleax Aug 10, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

@trevnorris FYI, this comes from 1e44fd9. I probably would have made the same mistake, but I wanted to let you know :)

bnoordhuis approved these changes Aug 10, 2017
View reviewed changes

bnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Good catch.

danbev commented Aug 10, 2017

Copy link
Copy Markdown
Contributor

I couldn’t reproduce the crash locally, but we’ve had this issue before with the same symptoms, and valgrind went from complaining to not complaining, so I’m feeling very confident that this is sufficient.

I'm able to reproduce this contently on arm here and I'll run this PR and report back.

danbev approved these changes Aug 10, 2017
View reviewed changes

danbev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Thanks for fixing this and sorry about causing it!

refack approved these changes Aug 10, 2017
View reviewed changes

refack left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

May your prefered deity bless you!

refack commented Aug 10, 2017

Copy link
Copy Markdown
Contributor

I'm +1 for fast tracking this (change is not big, and arm7 CI machine seems to consistently fail on this now)

refack commented Aug 10, 2017

Copy link
Copy Markdown
Contributor

/cc @nodejs/testing @jBarz

refack added the test Issues and PRs related to the tests. label Aug 10, 2017

addaleax commented Aug 10, 2017

Copy link
Copy Markdown
Member Author

Let’s wait for CI to come back, but yes, I’m okay with fast-tracking as well, these aren’t so terribly complex fixes.

addaleax commented Aug 10, 2017

Copy link
Copy Markdown
Member Author

CI is as green as the Windows XP default background!

Landed in 97c4394...c80d400

addaleax closed this Aug 10, 2017
addaleax deleted the fix-cctest branch August 10, 2017 20:11
addaleax added a commit that referenced this pull request Aug 10, 2017
src: add overlooked handle to cleanup
b559e66 
The `Environment::destroy_ids_timer_handle` should be cleaned up
by `Environment::CleanupHandles()`. Fix that by adding it to the list.

This partially fixes a cctest.

Ref: #14206
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
test: properly order freeing resources in cctest
93f25f4 
The `IsolateData` instance is created before the `Environment` instance,
so free in reverse order.

Fixes: #14206
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
Revert "test: add DISABLED_ prefix to commented out test"
ef7da42 
This reverts commit 75bf8a9.

Ref: #14206
Ref: #14317
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
Revert "test: disable MultipleEnvironmentsPerIsolate"
c80d400 
This reverts commit 95ab966.

Ref: #14206
Ref: #14246
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
src: add overlooked handle to cleanup
033773c 
The `Environment::destroy_ids_timer_handle` should be cleaned up
by `Environment::CleanupHandles()`. Fix that by adding it to the list.

This partially fixes a cctest.

Ref: #14206
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
test: properly order freeing resources in cctest
0bc3124 
The `IsolateData` instance is created before the `Environment` instance,
so free in reverse order.

Fixes: #14206
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
Revert "test: add DISABLED_ prefix to commented out test"
8ff2a5c 
This reverts commit 75bf8a9.

Ref: #14206
Ref: #14317
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax added a commit that referenced this pull request Aug 10, 2017
Revert "test: disable MultipleEnvironmentsPerIsolate"
a781bb4 
This reverts commit 95ab966.

Ref: #14206
Ref: #14246
PR-URL: #14749
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
addaleax mentioned this pull request Aug 13, 2017
Merged

MylesBorins commented Aug 16, 2017

Copy link
Copy Markdown
Contributor

Should this be backported to v6.x-staging? If yes please follow the guide and raise a backport PR, if no let me know or add the dont-land-on label.

refack mentioned this pull request Sep 28, 2017
Closed
This file contains hidden or 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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

bnoordhuis bnoordhuis approved these changes
cjihrig cjihrig approved these changes
+2 more reviewers
refack refack approved these changes
danbev danbev approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c++ Issues and PRs that require attention from people who are familiar with C++. test Issues and PRs related to the tests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

Back | FazBrowse Home | New Git URL