Use RCUTILS_NO_FAULT_INJECTION() macro everywhere.

Signed-off-by: Michel Hidalgo <[email protected]>
ros2 · Sep 30, 2020 · 7309204 · 7309204
1 parent 7c8618d
commit 7309204
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 47 deletions.
diff --git a/test_rmw_implementation/test/test_client.cpp b/test_rmw_implementation/test/test_client.cpp
@@ -176,12 +176,12 @@ TEST_F(CLASSNAME(TestClient, RMW_IMPLEMENTATION), destroy_with_internal_errors)
     ROSIDL_GET_SRV_TYPE_SUPPORT(test_msgs, srv, BasicTypes);
   RCUTILS_FAULT_INJECTION_TEST(
   {
-    int64_t count = rcutils_fault_injection_get_count();
-    rcutils_fault_injection_set_count(RCUTILS_FAULT_INJECTION_NEVER_FAIL);
-    rmw_client_t * client =
-    rmw_create_client(node, ts, service_name, &rmw_qos_profile_default);
-    ASSERT_NE(nullptr, client) << rmw_get_error_string().str;
-    rcutils_fault_injection_set_count(count);
+    rmw_client_t * client = nullptr;
+    RCUTILS_NO_FAULT_INJECTION(
+    {
+      client = rmw_create_client(node, ts, service_name, &rmw_qos_profile_default);
+      ASSERT_NE(nullptr, client) << rmw_get_error_string().str;
+    });
     if (RMW_RET_OK != rmw_destroy_client(node, client)) {
       rmw_reset_error();
     }
@@ -402,26 +402,3 @@ TEST_F(CLASSNAME(TestClientUse, RMW_IMPLEMENTATION), service_server_is_available
   ret = rmw_destroy_service(node, service);
   EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
 }
-
-TEST_F(CLASSNAME(TestClient, RMW_IMPLEMENTATION), create_client_with_internal_errors)
-{
-  RCUTILS_FAULT_INJECTION_TEST(
-  {
-    const rosidl_service_type_support_t * ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
-      test_msgs, srv, BasicTypes);
-    rmw_client_t * client_fault = rmw_create_client(
-      node, ts, "/service_name_test",
-      &rmw_qos_profile_default);
-
-    int64_t count = rcutils_fault_injection_get_count();
-    rcutils_fault_injection_set_count(RCUTILS_FAULT_INJECTION_NEVER_FAIL);
-
-    if (client_fault != nullptr) {
-      rmw_ret_t ret = rmw_destroy_client(node, client_fault);
-      EXPECT_EQ(ret, RMW_RET_OK) << rcutils_get_error_string().str;
-    } else {
-      rmw_reset_error();
-    }
-    rcutils_fault_injection_set_count(count);
-  });
-}
diff --git a/test_rmw_implementation/test/test_create_destroy_node.cpp b/test_rmw_implementation/test/test_create_destroy_node.cpp
@@ -205,11 +205,12 @@ TEST_F(
   {
     constexpr char node_name[] = "my_node";
     constexpr char node_namespace[] = "/my_ns";
-    int64_t count = rcutils_fault_injection_get_count();
-    rcutils_fault_injection_set_count(RCUTILS_FAULT_INJECTION_NEVER_FAIL);
-    rmw_node_t * node = rmw_create_node(&context, node_name, node_namespace);
-    ASSERT_NE(nullptr, node) << rmw_get_error_string().str;
-    rcutils_fault_injection_set_count(count);
+    rmw_node_t * node = nullptr;
+    RCUTILS_NO_FAULT_INJECTION(
+    {
+      node = rmw_create_node(&context, node_name, node_namespace);
+      ASSERT_NE(nullptr, node) << rmw_get_error_string().str;
+    });
     if (RMW_RET_OK != rmw_destroy_node(node)) {
       rmw_reset_error();
     }

diff --git a/test_rmw_implementation/test/test_publisher.cpp b/test_rmw_implementation/test/test_publisher.cpp
@@ -91,14 +91,15 @@ TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), create_with_internal_errors
 
   RCUTILS_FAULT_INJECTION_TEST(
   {
+    rmw_publisher_t * pub = nullptr;
     rmw_publisher_options_t options = rmw_get_default_publisher_options();
-    rmw_publisher_t * pub =
-    rmw_create_publisher(node, ts, topic_name, &rmw_qos_profile_default, &options);
+    pub = rmw_create_publisher(node, ts, topic_name, &rmw_qos_profile_default, &options);
     if (pub) {
-      int64_t count = rcutils_fault_injection_get_count();
-      rcutils_fault_injection_set_count(RCUTILS_FAULT_INJECTION_NEVER_FAIL);
-      EXPECT_EQ(RMW_RET_OK, rmw_destroy_publisher(node, pub)) << rmw_get_error_string().str;
-      rcutils_fault_injection_set_count(count);
+      RCUTILS_NO_FAULT_INJECTION(
+      {
+        rmw_ret_t ret = rmw_destroy_publisher(node, pub);
+        EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
+      });
     } else {
       rmw_reset_error();
     }
@@ -215,13 +216,13 @@ TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), destroy_with_internal_error
 
   RCUTILS_FAULT_INJECTION_TEST(
   {
-    int64_t count = rcutils_fault_injection_get_count();
-    rcutils_fault_injection_set_count(RCUTILS_FAULT_INJECTION_NEVER_FAIL);
-    rmw_publisher_options_t options = rmw_get_default_publisher_options();
-    rmw_publisher_t * pub =
-    rmw_create_publisher(node, ts, topic_name, &rmw_qos_profile_default, &options);
-    ASSERT_NE(nullptr, pub) << rmw_get_error_string().str;
-    rcutils_fault_injection_set_count(count);
+    rmw_publisher_t * pub = nullptr;
+    RCUTILS_NO_FAULT_INJECTION(
+    {
+      rmw_publisher_options_t options = rmw_get_default_publisher_options();
+      pub = rmw_create_publisher(node, ts, topic_name, &rmw_qos_profile_default, &options);
+      ASSERT_NE(nullptr, pub) << rmw_get_error_string().str;
+    });
     if (RMW_RET_OK != rmw_destroy_publisher(node, pub)) {
       rmw_reset_error();
     }