Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fault injection tests to construction/destruction APIs. #144

Merged
merged 4 commits into from
Oct 5, 2020
Merged

Add fault injection tests to construction/destruction APIs. #144

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bdb65b
Add fault injection tests to all construction/destruction APIs.
hidmic Sep 25, 2020
7c8618d
Use RCUTILS_NO_FAULT_INJECTION() macro.
hidmic Sep 30, 2020
7309204
Use RCUTILS_NO_FAULT_INJECTION() macro everywhere.
hidmic Sep 30, 2020
ceac659
Adapt wait_set tests for extra fault injection.
hidmic Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test_rmw_implementation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if(BUILD_TESTING)
ament_add_gtest(test_subscription${target_suffix}
test/test_subscription.cpp
ENV ${rmw_implementation_env_var}
TIMEOUT 80
TIMEOUT 120
)
target_compile_definitions(test_subscription${target_suffix}
PUBLIC "RMW_IMPLEMENTATION=${rmw_implementation}")
Expand Down
38 changes: 38 additions & 0 deletions test_rmw_implementation/test/test_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,44 @@ TEST_F(CLASSNAME(TestClient, RMW_IMPLEMENTATION), create_with_bad_arguments) {
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
}

TEST_F(CLASSNAME(TestClient, RMW_IMPLEMENTATION), create_with_internal_errors) {
constexpr char service_name[] = "/test";
const rosidl_service_type_support_t * ts =
ROSIDL_GET_SRV_TYPE_SUPPORT(test_msgs, srv, BasicTypes);
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_client_t * client =
rmw_create_client(node, ts, service_name, &rmw_qos_profile_default);
if (client) {
RCUTILS_NO_FAULT_INJECTION(
{
rmw_ret_t ret = rmw_destroy_client(node, client);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
} else {
rmw_reset_error();
}
});
}

TEST_F(CLASSNAME(TestClient, RMW_IMPLEMENTATION), destroy_with_internal_errors) {
constexpr char service_name[] = "/test";
const rosidl_service_type_support_t * ts =
ROSIDL_GET_SRV_TYPE_SUPPORT(test_msgs, srv, BasicTypes);
RCUTILS_FAULT_INJECTION_TEST(
{
int64_t count = rcutils_fault_injection_get_count();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing RCUTILS_NO_FAULT_INJECTION

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argh, thought I had covered them all. See 7309204.

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);
if (RMW_RET_OK != rmw_destroy_client(node, client)) {
rmw_reset_error();
}
});
}

class CLASSNAME (TestClientUse, RMW_IMPLEMENTATION)
: public CLASSNAME(TestClient, RMW_IMPLEMENTATION)
{
Expand Down
42 changes: 42 additions & 0 deletions test_rmw_implementation/test/test_create_destroy_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@

#include <gtest/gtest.h>

#include "osrf_testing_tools_cpp/memory_tools/memory_tools.hpp"

#include "rcutils/allocator.h"
#include "rcutils/strdup.h"

#include "rmw/error_handling.h"
#include "rmw/rmw.h"

#include "./testing_macros.hpp"


#ifdef RMW_IMPLEMENTATION
# define CLASSNAME_(NAME, SUFFIX) NAME ## __ ## SUFFIX
Expand Down Expand Up @@ -173,3 +177,41 @@ TEST_F(
ASSERT_NE(nullptr, node) << rmw_get_error_string().str;
EXPECT_EQ(RMW_RET_OK, rmw_destroy_node(node)) << rmw_get_error_string().str;
}

TEST_F(
CLASSNAME(TestNodeConstructionDestruction, RMW_IMPLEMENTATION),
create_with_internal_errors) {
RCUTILS_FAULT_INJECTION_TEST(
{
constexpr char node_name[] = "my_node";
constexpr char node_namespace[] = "/my_ns";
rmw_node_t * node = rmw_create_node(&context, node_name, node_namespace);
if (node) {
RCUTILS_NO_FAULT_INJECTION(
{
rmw_ret_t ret = rmw_destroy_node(node);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
} else {
rmw_reset_error();
}
});
}

TEST_F(
CLASSNAME(TestNodeConstructionDestruction, RMW_IMPLEMENTATION),
destroy_with_internal_errors) {
RCUTILS_FAULT_INJECTION_TEST(
{
constexpr char node_name[] = "my_node";
constexpr char node_namespace[] = "/my_ns";
int64_t count = rcutils_fault_injection_get_count();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 7309204.

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);
if (RMW_RET_OK != rmw_destroy_node(node)) {
rmw_reset_error();
}
});
}
72 changes: 72 additions & 0 deletions test_rmw_implementation/test/test_init_shutdown.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,18 @@

#include <gtest/gtest.h>

#include "osrf_testing_tools_cpp/memory_tools/memory_tools.hpp"

#include "rcutils/allocator.h"
#include "rcutils/error_handling.h"
#include "rcutils/macros.h"
#include "rcutils/strdup.h"

#include "rmw/error_handling.h"
#include "rmw/rmw.h"

#include "./testing_macros.hpp"

#ifdef RMW_IMPLEMENTATION
# define CLASSNAME_(NAME, SUFFIX) NAME ## __ ## SUFFIX
# define CLASSNAME(NAME, SUFFIX) CLASSNAME_(NAME, SUFFIX)
Expand Down Expand Up @@ -170,3 +176,69 @@ TEST_F(CLASSNAME(TestInitShutdown, RMW_IMPLEMENTATION), init_shutdown) {
ret = rmw_context_fini(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
}

TEST_F(CLASSNAME(TestInitShutdown, RMW_IMPLEMENTATION), init_with_internal_errors) {
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_context_t context = rmw_get_zero_initialized_context();
rmw_ret_t ret = rmw_init(&options, &context);

RCUTILS_NO_FAULT_INJECTION(
{
if (RMW_RET_OK == ret) {
ret = rmw_shutdown(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ret = rmw_context_fini(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
} else {
rmw_reset_error();
}
});
});
}

TEST_F(CLASSNAME(TestInitShutdown, RMW_IMPLEMENTATION), shutdown_with_internal_errors) {
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_ret_t ret = RMW_RET_OK;
rmw_context_t context = rmw_get_zero_initialized_context();

RCUTILS_NO_FAULT_INJECTION(
{
ret = rmw_init(&options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});

ret = rmw_shutdown(&context);

RCUTILS_NO_FAULT_INJECTION(
{
if (RMW_RET_OK != ret) {
rmw_reset_error();

ret = rmw_shutdown(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
}
ret = rmw_context_fini(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
});
}

TEST_F(CLASSNAME(TestInitShutdown, RMW_IMPLEMENTATION), context_fini_with_internal_errors) {
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_context_t context = rmw_get_zero_initialized_context();
RCUTILS_NO_FAULT_INJECTION(
{
rmw_ret_t ret = rmw_init(&options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ret = rmw_shutdown(&context);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});

if (RMW_RET_OK != rmw_context_fini(&context)) {
rmw_reset_error();
}
});
}
84 changes: 84 additions & 0 deletions test_rmw_implementation/test/test_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
#include <gtest/gtest.h>

#include "osrf_testing_tools_cpp/memory_tools/gtest_quickstart.hpp"
#include "osrf_testing_tools_cpp/scope_exit.hpp"

#include "rcutils/allocator.h"
#include "rcutils/macros.h"
#include "rcutils/strdup.h"

#include "rmw/rmw.h"
Expand Down Expand Up @@ -82,6 +84,27 @@ TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), create_and_destroy) {
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
}

TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), create_with_internal_errors) {
constexpr char topic_name[] = "/test";
const rosidl_message_type_support_t * ts =
ROSIDL_GET_MSG_TYPE_SUPPORT(test_msgs, msg, BasicTypes);

RCUTILS_FAULT_INJECTION_TEST(
{
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);
if (pub) {
int64_t count = rcutils_fault_injection_get_count();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 7309204.

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);
} else {
rmw_reset_error();
}
});
}

TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), create_and_destroy_native) {
rmw_publisher_options_t options = rmw_get_default_publisher_options();
constexpr char topic_name[] = "test";
Expand Down Expand Up @@ -185,6 +208,26 @@ TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), destroy_with_bad_arguments)
rmw_reset_error();
}

TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), destroy_with_internal_errors) {
constexpr char topic_name[] = "/test";
const rosidl_message_type_support_t * ts =
ROSIDL_GET_MSG_TYPE_SUPPORT(test_msgs, msg, BasicTypes);

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);
if (RMW_RET_OK != rmw_destroy_publisher(node, pub)) {
rmw_reset_error();
}
});
}

TEST_F(CLASSNAME(TestPublisher, RMW_IMPLEMENTATION), get_actual_qos_from_system_defaults) {
rmw_publisher_options_t options = rmw_get_default_publisher_options();
constexpr char topic_name[] = "/test";
Expand Down Expand Up @@ -405,6 +448,20 @@ TEST_F(
test_msgs__msg__BasicTypes__fini(&input_message);
}

TEST_F(CLASSNAME(TestPublisherUse, RMW_IMPLEMENTATION), publish_with_internal_errors) {
test_msgs__msg__BasicTypes message{};
ASSERT_TRUE(test_msgs__msg__BasicTypes__init(&message));
rmw_publisher_allocation_t * null_allocation{nullptr}; // still a valid allocation

RCUTILS_FAULT_INJECTION_TEST(
{
rmw_ret_t ret = rmw_publish(pub, &message, null_allocation);
if (RMW_RET_OK != ret) {
rmw_reset_error();
}
});
}

TEST_F(
CLASSNAME(TestPublisherUse, RMW_IMPLEMENTATION),
publish_serialized_message_with_bad_arguments) {
Expand Down Expand Up @@ -434,6 +491,33 @@ TEST_F(
RMW_RET_OK, rmw_serialized_message_fini(&serialized_message)) << rmw_get_error_string().str;
}

TEST_F(CLASSNAME(TestPublisherUse, RMW_IMPLEMENTATION), publish_serialized_with_internal_errors) {
test_msgs__msg__BasicTypes message{};
ASSERT_TRUE(test_msgs__msg__BasicTypes__init(&message));
rcutils_allocator_t default_allocator = rcutils_get_default_allocator();
rmw_serialized_message_t serialized_message = rmw_get_zero_initialized_serialized_message();
rmw_ret_t ret = rmw_serialized_message_init(&serialized_message, 0lu, &default_allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_serialized_message_fini(&serialized_message);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
ret = rmw_serialize(&message, ts, &serialized_message);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
rmw_publisher_allocation_t * null_allocation{nullptr}; // still a valid allocation

RCUTILS_FAULT_INJECTION_TEST(
{
ret = rmw_publish_serialized_message(
pub, &serialized_message, null_allocation);
if (RMW_RET_OK != ret) {
rmw_reset_error();
}
});
}


class CLASSNAME (TestPublisherUseLoan, RMW_IMPLEMENTATION)
: public CLASSNAME(TestPublisherUse, RMW_IMPLEMENTATION)
{
Expand Down
38 changes: 38 additions & 0 deletions test_rmw_implementation/test/test_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,44 @@ TEST_F(CLASSNAME(TestService, RMW_IMPLEMENTATION), create_with_bad_arguments) {
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
}


TEST_F(CLASSNAME(TestService, RMW_IMPLEMENTATION), create_with_internal_errors) {
constexpr char service_name[] = "/test";
const rosidl_service_type_support_t * ts =
ROSIDL_GET_SRV_TYPE_SUPPORT(test_msgs, srv, BasicTypes);
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_service_t * srv = rmw_create_service(node, ts, service_name, &rmw_qos_profile_default);
if (srv) {
RCUTILS_NO_FAULT_INJECTION(
{
rmw_ret_t ret = rmw_destroy_service(node, srv);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
} else {
rmw_reset_error();
}
});
}

TEST_F(CLASSNAME(TestService, RMW_IMPLEMENTATION), destroy_with_internal_errors) {
constexpr char service_name[] = "/test";
const rosidl_service_type_support_t * ts =
ROSIDL_GET_SRV_TYPE_SUPPORT(test_msgs, srv, BasicTypes);
RCUTILS_FAULT_INJECTION_TEST(
{
rmw_service_t * srv = nullptr;
RCUTILS_NO_FAULT_INJECTION(
{
srv = rmw_create_service(node, ts, service_name, &rmw_qos_profile_default);
ASSERT_NE(nullptr, srv) << rmw_get_error_string().str;
});
if (RMW_RET_OK != rmw_destroy_service(node, srv)) {
rmw_reset_error();
}
});
}

class CLASSNAME (TestServiceUse, RMW_IMPLEMENTATION)
: public CLASSNAME(TestService, RMW_IMPLEMENTATION)
{
Expand Down
Loading