nodejs
diff --git a/‎test/cctest/node_test_fixture.h‎
Lines changed: 1 addition & 0 deletions b/‎test/cctest/node_test_fixture.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/cctest/test_environment.cc‎
Lines changed: 13 additions & 0 deletions b/‎test/cctest/test_environment.cc‎
Lines changed: 13 additions & 0 deletions
@@ -107,6 +107,7 @@ class NodeTestFixture : public ::testing::Test {
   void TearDown() override {
     isolate_->Exit();
     isolate_->Dispose();
+    platform->DrainTasks(isolate_);
     platform->UnregisterIsolate(isolate_);
     isolate_ = nullptr;
   }
 
@@ -88,6 +88,19 @@ TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
   EXPECT_TRUE(called_cb_2);
 }
 
+TEST_F(EnvironmentTest, NoEnvironmentSanity) {
+  const v8::HandleScope handle_scope(isolate_);
+  v8::Local<v8::Context> context = v8::Context::New(isolate_);
+  EXPECT_EQ(node::Environment::GetCurrent(context), nullptr);
+  EXPECT_EQ(node::GetCurrentEnvironment(context), nullptr);
+  EXPECT_EQ(node::Environment::GetCurrent(isolate_), nullptr);
+
+  v8::Context::Scope context_scope(context);
+  EXPECT_EQ(node::Environment::GetCurrent(context), nullptr);
+  EXPECT_EQ(node::GetCurrentEnvironment(context), nullptr);
+  EXPECT_EQ(node::Environment::GetCurrent(isolate_), nullptr);
+}
+
 TEST_F(EnvironmentTest, NonNodeJSContext) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
Original file line number	Diff line number	Diff line change
@@ -107,6 +107,7 @@ class NodeTestFixture : public ::testing::Test {
107	107	void TearDown() override {
108	108	isolate_->Exit();
109	109	isolate_->Dispose();
	110	+ platform->DrainTasks(isolate_);
110	111	platform->UnregisterIsolate(isolate_);
111	112	isolate_ = nullptr;
112	113	}