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

Jump to bottom

Replace deprecated spin_until_future_complete #1600

Closed
wants to merge 1 commit into from
Closed

Replace deprecated spin_until_future_complete #1600

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_test_common/include/rosbag2_test_common/client_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class ClientManager : public rclcpp::Node
auto request = std::make_shared<typename ServiceT::Request>();
auto result = client->async_send_request(request);
// Wait for the result.
if (rclcpp::executors::spin_node_until_future_complete(
if (rclcpp::executors::spin_node_until_complete(
exec_, get_node_base_interface(), result, timeout) != rclcpp::FutureReturnCode::SUCCESS)
{
RCLCPP_INFO(
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_transport/test/rosbag2_transport/composition_manager_test_fixture.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class CompositionManagerTestFixture
auto unload_node_future = unload_node_client_->async_send_request(unload_node_request);
// Wait for the response
auto unload_node_ret =
exec_->spin_until_future_complete(unload_node_future, std::chrono::seconds(10));
exec_->spin_until_complete(unload_node_future, std::chrono::seconds(10));
auto unload_node_response = unload_node_future.get();
EXPECT_EQ(unload_node_ret, rclcpp::FutureReturnCode::SUCCESS);
EXPECT_EQ(unload_node_response->success, true);
Expand Down
8 changes: 4 additions & 4 deletions rosbag2_transport/test/rosbag2_transport/test_composable_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ComposablePlayerIntegrationTests : public CompositionManagerTestFixture
EXPECT_TRUE(is_paused_client_->wait_for_service(std::chrono::seconds(10)));
auto is_paused_request = std::make_shared<srvIsPaused::Request>();
auto is_paused_future = is_paused_client_->async_send_request(is_paused_request);
auto ret = exec_->spin_until_future_complete(is_paused_future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(is_paused_future, 10s); // Wait for the result.
EXPECT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = std::make_shared<srvIsPaused::Response>();
EXPECT_NO_THROW({result = is_paused_future.get();});
Expand All @@ -84,7 +84,7 @@ class ComposablePlayerIntegrationTests : public CompositionManagerTestFixture
EXPECT_TRUE(resume_client_->wait_for_service(std::chrono::seconds(10)));
auto resume_request = std::make_shared<srvResume::Request>();
auto resume_future = resume_client_->async_send_request(resume_request);
auto ret = exec_->spin_until_future_complete(resume_future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(resume_future, 10s); // Wait for the result.
EXPECT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = std::make_shared<srvResume::Response>();
EXPECT_NO_THROW({result = resume_future.get();});
Expand All @@ -100,7 +100,7 @@ class ComposablePlayerIntegrationTests : public CompositionManagerTestFixture
play_request->playback_until_timestamp = rclcpp::Time(0, -1);
play_request->playback_duration = rclcpp::Duration(-1, 0);
auto play_future = play_client_->async_send_request(play_request);
auto ret = exec_->spin_until_future_complete(play_future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(play_future, 10s); // Wait for the result.
EXPECT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = std::make_shared<srvPlay::Response>();
EXPECT_NO_THROW({result = play_future.get();});
Expand Down Expand Up @@ -192,7 +192,7 @@ TEST_P(ComposablePlayerIntegrationTests, player_can_automatically_play_file_afte
load_node_request->parameters.push_back(start_paused.to_parameter_msg());

auto load_node_future = load_node_client_->async_send_request(load_node_request);
auto ret = exec_->spin_until_future_complete(load_node_future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(load_node_future, 10s); // Wait for the result.
ASSERT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = load_node_future.get();
EXPECT_EQ(result->success, true);
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_transport/test/rosbag2_transport/test_composable_recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ TEST_P(

auto load_node_future = load_node_client_->async_send_request(load_node_request);
// Wait for the response
auto load_node_ret = exec_->spin_until_future_complete(load_node_future, 10s);
auto load_node_ret = exec_->spin_until_complete(load_node_future, 10s);
ASSERT_EQ(load_node_ret, rclcpp::FutureReturnCode::SUCCESS);
auto load_node_response = load_node_future.get();
EXPECT_EQ(load_node_response->success, true);
Expand Down
4 changes: 2 additions & 2 deletions rosbag2_transport/test/rosbag2_transport/test_load_composable_components.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST_P(CompositionManagerTestFixture, test_load_play_component)
request->parameters.push_back(storage_id.to_parameter_msg());

auto future = load_node_client_->async_send_request(request);
auto ret = exec_->spin_until_future_complete(future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(future, 10s); // Wait for the result.
ASSERT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = future.get();
EXPECT_EQ(result->success, true);
Expand Down Expand Up @@ -80,7 +80,7 @@ TEST_P(CompositionManagerTestFixture, test_load_record_component)
request->parameters.push_back(storage_id.to_parameter_msg());

auto future = load_node_client_->async_send_request(request);
auto ret = exec_->spin_until_future_complete(future, 10s); // Wait for the result.
auto ret = exec_->spin_until_complete(future, 10s); // Wait for the result.
ASSERT_EQ(ret, rclcpp::FutureReturnCode::SUCCESS);
auto result = future.get();
EXPECT_EQ(result->success, true);
Expand Down
Loading