Fix up TestClient*.service_server_is_available tests

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · May 5, 2021 · 2da26ad · 2da26ad
1 parent 37fe921
commit 2da26ad
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/test_rmw_implementation/test/test_client.cpp b/test_rmw_implementation/test/test_client.cpp
@@ -386,25 +386,25 @@ TEST_F(CLASSNAME(TestClientUse, RMW_IMPLEMENTATION), service_server_is_available
 {
   bool is_available = false;
   rmw_ret_t ret = rmw_service_server_is_available(node, client, &is_available);
-  EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
+  ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
   ASSERT_FALSE(is_available);
-  rmw_reset_error();
 
   rmw_service_t * service = rmw_create_service(node, ts, service_name, &qos_profile);
-  ASSERT_NE(nullptr, client) << rcutils_get_error_string().str;
+  ASSERT_NE(nullptr, client) << rmw_get_error_string().str;
+  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
+  {
+    rmw_ret_t ret = rmw_destroy_service(node, service);
+    EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
+    rmw_reset_error();
+  });
 
   is_available = false;
   SLEEP_AND_RETRY_UNTIL(rmw_intraprocess_discovery_delay, rmw_intraprocess_discovery_delay * 10) {
     ret = rmw_service_server_is_available(node, client, &is_available);
-    EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
-    rmw_reset_error();
+    ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
     if (is_available) {
       break;
     }
   }
-  EXPECT_TRUE(is_available) << rmw_get_error_string().str;
-  rmw_reset_error();
-
-  ret = rmw_destroy_service(node, service);
-  EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
+  ASSERT_TRUE(is_available);
 }