From 6bc4cd5e34fed941ea9373458b233a6d1c49edea Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Fri, 2 Feb 2018 10:35:43 +0100
Subject: [PATCH] test: remove destructor from node_test_fixture

This commit removes the destructor from node_test_fixture.h which calls
the TearDown function causing TearDown to be called twice. This also
allows us to remove the check of the platform_ in TearDown.

Also the Setup/TearDown functions in AliasBufferTest are removed as they
are not necessary.

PR-URL: https://github.com/nodejs/node/pull/18524
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/cctest/node_test_fixture.h    |  5 -----
 test/cctest/test_aliased_buffer.cc | 11 +----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index d5be613c0bd105..ae9ec32e1ee9e4 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -63,10 +63,6 @@ class NodeTestFixture : public ::testing::Test {
  protected:
   v8::Isolate* isolate_;
 
-  ~NodeTestFixture() {
-    TearDown();
-  }
-
   virtual void SetUp() {
     CHECK_EQ(0, uv_loop_init(&current_loop));
     platform_ = new node::NodePlatform(8, nullptr);
@@ -78,7 +74,6 @@ class NodeTestFixture : public ::testing::Test {
   }
 
   virtual void TearDown() {
-    if (platform_ == nullptr) return;
     platform_->Shutdown();
     while (uv_loop_alive(&current_loop)) {
       uv_run(&current_loop, UV_RUN_ONCE);
diff --git a/test/cctest/test_aliased_buffer.cc b/test/cctest/test_aliased_buffer.cc
index 8dfb02c181cffe..0eaddf773555db 100644
--- a/test/cctest/test_aliased_buffer.cc
+++ b/test/cctest/test_aliased_buffer.cc
@@ -5,16 +5,7 @@
 
 using node::AliasedBuffer;
 
-class AliasBufferTest : public NodeTestFixture {
- protected:
-  void SetUp() override {
-    NodeTestFixture::SetUp();
-  }
-
-  void TearDown() override {
-    NodeTestFixture::TearDown();
-  }
-};
+class AliasBufferTest : public NodeTestFixture {};
 
 template<class NativeT>
 void CreateOracleValues(NativeT* buf, size_t count) {