Skip to content

Fix cctest #14749

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

Fix cctest #14749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a0ee6d
src: add overlooked handle to cleanup
addaleax Aug 10, 2017
682a951
test: properly order freeing resources in cctest
addaleax Aug 10, 2017
3f95be9
Revert "test: add DISABLED_ prefix to commented out test"
addaleax Aug 10, 2017
557eb7b
Revert "test: disable MultipleEnvironmentsPerIsolate"
addaleax Aug 10, 2017
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
4 changes: 4 additions & 0 deletions src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ void Environment::Start(int argc,
reinterpret_cast<uv_handle_t*>(&idle_check_handle_),
close_and_finish,
nullptr);
RegisterHandleCleanup(
reinterpret_cast<uv_handle_t*>(&destroy_ids_timer_handle_),
close_and_finish,
nullptr);
Copy link
Member Author

Choose a reason for hiding this comment

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

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


if (start_profiler_idle_notifier) {
StartProfilerIdleNotifier();
Expand Down
4 changes: 2 additions & 2 deletions test/cctest/test_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class EnvironmentTest : public NodeTestFixture {
}

~Env() {
FreeIsolateData(isolate_data_);
environment_->CleanupHandles();
FreeEnvironment(environment_);
FreeIsolateData(isolate_data_);
}

Environment* operator*() const {
Expand Down Expand Up @@ -85,7 +85,7 @@ TEST_F(EnvironmentTest, AtExitWithArgument) {
EXPECT_EQ(arg, cb_1_arg);
}

TEST_F(EnvironmentTest, DISABLED_MultipleEnvironmentsPerIsolate) {
TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
const v8::HandleScope handle_scope(isolate_);
const Argv argv;
Env env1 {handle_scope, isolate_, argv};
Expand Down