Skip to content

Fix excluded action filtering in player #2451

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

Open
Old-Ding wants to merge 1 commit into
base: rolling
Choose a base branch
from
+4 −2
Open

Fix excluded action filtering in player #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 rosbag2_transport/src/rosbag2_transport/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ bool allow_topic(
}
case TopicKind::ACTION_INTERFACE_TOPIC:
{
if (!exclude_topics.empty()) {
if (!exclude_actions.empty()) {
auto it = std::find(exclude_actions.begin(), exclude_actions.end(), topic_name);
if (it != exclude_actions.end()) {
return false;
Expand Down
4 changes: 3 additions & 1 deletion rosbag2_transport/test/rosbag2_transport/test_play.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,8 @@ TEST_F(RosBag2PlayTestFixture, recorded_messages_are_played_for_filtered_actions
};

// send actions as client
play_options_.actions_to_filter = {action_name2};
play_options_.actions_to_filter = {action_name1, action_name2};
play_options_.exclude_actions_to_filter = {action_name1};
play_options_.send_actions_as_client = true;
auto prepared_mock_reader = std::make_unique<MockSequentialReader>();
prepared_mock_reader->prepare(messages, actions_types);
Expand Down Expand Up @@ -1803,6 +1804,7 @@ TEST_F(RosBag2PlayTestFixture, recorded_messages_are_played_for_filtered_actions
EXPECT_EQ(action1_cancel_count, 0);
ASSERT_EQ(action2_request_count, 1);
EXPECT_EQ(action2_cancel_count, 0);
EXPECT_THAT(player->get_list_of_action_clients(), SizeIs(1));

// There is no direct interface to confirm that rosbag2 received the get_result response.
// Here, the logic of handling actions in rosbag2 is used to make this determination. If
Expand Down