From 05165ad41ecac2af9ba7c82cfbddda4074b38974 Mon Sep 17 00:00:00 2001
From: CursedRock17 <mtglucas1@gmail.com>
Date: Tue, 19 Sep 2023 22:48:19 -0400
Subject: [PATCH 1/2] Removing Old Connext Tests

Signed-off-by: CursedRock17 <mtglucas1@gmail.com>
---
 rclcpp/test/rclcpp/CMakeLists.txt | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/rclcpp/test/rclcpp/CMakeLists.txt b/rclcpp/test/rclcpp/CMakeLists.txt
index 8c31a95415..897c0621c0 100644
--- a/rclcpp/test/rclcpp/CMakeLists.txt
+++ b/rclcpp/test/rclcpp/CMakeLists.txt
@@ -34,13 +34,7 @@ if(TARGET test_exceptions)
   target_link_libraries(test_exceptions ${PROJECT_NAME} mimick)
 endif()
 
-# Increasing timeout because connext can take a long time to destroy nodes
-# TODO(brawner) remove when destroying Node for Connext is resolved. See:
-# https://github.com/ros2/rclcpp/issues/1250
-ament_add_gtest(
-  test_allocator_memory_strategy
-  strategies/test_allocator_memory_strategy.cpp
-  TIMEOUT 360)
+ament_add_gtest(test_allocator_memory_strategy strategies/test_allocator_memory_strategy.cpp)
 if(TARGET test_allocator_memory_strategy)
   ament_target_dependencies(test_allocator_memory_strategy
     "rcl"
@@ -669,13 +663,10 @@ if(TARGET test_interface_traits)
   target_link_libraries(test_interface_traits ${PROJECT_NAME})
 endif()
 
-# TODO(brawner) remove when destroying Node for Connext is resolved. See:
-# https://github.com/ros2/rclcpp/issues/1250
 ament_add_gtest(
   test_executors
   executors/test_executors.cpp
-  APPEND_LIBRARY_DIRS "${append_library_dirs}"
-  TIMEOUT 180)
+  APPEND_LIBRARY_DIRS "${append_library_dirs}")
 if(TARGET test_executors)
   ament_target_dependencies(test_executors
     "rcl"

From 0df6cc47616383f752da334b00b2d1e38dcb642e Mon Sep 17 00:00:00 2001
From: CursedRock17 <mtglucas1@gmail.com>
Date: Wed, 20 Sep 2023 17:09:05 -0400
Subject: [PATCH 2/2] Revert timeout

Signed-off-by: CursedRock17 <mtglucas1@gmail.com>
---
 rclcpp/test/rclcpp/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rclcpp/test/rclcpp/CMakeLists.txt b/rclcpp/test/rclcpp/CMakeLists.txt
index 897c0621c0..159f990f32 100644
--- a/rclcpp/test/rclcpp/CMakeLists.txt
+++ b/rclcpp/test/rclcpp/CMakeLists.txt
@@ -666,7 +666,8 @@ endif()
 ament_add_gtest(
   test_executors
   executors/test_executors.cpp
-  APPEND_LIBRARY_DIRS "${append_library_dirs}")
+  APPEND_LIBRARY_DIRS "${append_library_dirs}"
+  TIMEOUT 180)
 if(TARGET test_executors)
   ament_target_dependencies(test_executors
     "rcl"