From d10f7b7c62487da3cd5492bc4c50c922e90ae9ef Mon Sep 17 00:00:00 2001
From: Devin Bonnie <47613035+dabonnie@users.noreply.github.com>
Date: Wed, 6 May 2020 09:04:45 -0700
Subject: [PATCH] Fix tests that were not properly torn down (#1073)

Signed-off-by: Devin Bonnie <dbbonnie@amazon.com>
---
 rclcpp/test/test_publisher_subscription_count_api.cpp | 6 +++++-
 rclcpp/test/test_subscription_publisher_count_api.cpp | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rclcpp/test/test_publisher_subscription_count_api.cpp b/rclcpp/test/test_publisher_subscription_count_api.cpp
index c709ff9..cbcd4f1 100644
--- a/rclcpp/test/test_publisher_subscription_count_api.cpp
+++ b/rclcpp/test/test_publisher_subscription_count_api.cpp
@@ -15,8 +15,8 @@
 #include <gtest/gtest.h>
 
 #include <iostream>
-#include <string>
 #include <memory>
+#include <string>
 
 #include "rclcpp/exceptions.hpp"
 #include "rclcpp/publisher.hpp"
@@ -51,6 +51,10 @@ public:
   {
     rclcpp::init(0, nullptr);
   }
+  static void TearDownTestCase()
+  {
+    rclcpp::shutdown();
+  }
 
 protected:
   void SetUp() {}
diff --git a/rclcpp/test/test_subscription_publisher_count_api.cpp b/rclcpp/test/test_subscription_publisher_count_api.cpp
index 0ad28d5..e79b332 100644
--- a/rclcpp/test/test_subscription_publisher_count_api.cpp
+++ b/rclcpp/test/test_subscription_publisher_count_api.cpp
@@ -44,6 +44,10 @@ public:
   {
     rclcpp::init(0, nullptr);
   }
+  static void TearDownTestCase()
+  {
+    rclcpp::shutdown();
+  }
 
 protected:
   void SetUp() {}