Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Remove ROSNotOKException (#458)
Browse files Browse the repository at this point in the history
Co-authored-by: Immanuel Martini <[email protected]>
  • Loading branch information
agutenkunst and martiniil authored Oct 22, 2020
1 parent e9a0b37 commit 944f844
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 40 deletions.
6 changes: 2 additions & 4 deletions pilz_control/test/pjtc_test_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@

#include <control_msgs/FollowJointTrajectoryActionGoal.h>

#include <pilz_testutils/ros_not_ok_exception.h>

#include "robot_mock.h"

namespace pilz_joint_trajectory_controller_test
Expand Down Expand Up @@ -110,7 +108,7 @@ static ros::Duration getGoalDuration(const control_msgs::FollowJointTrajectoryGo
* @param update_func Update function. If non-empty, the following is done periodically:
* - Make progress in simulated ros::Time,
* - Invoke update_func.
* @throws ROSNotOkException if ros::ok() returned false
* @throws std::runtime_error if ros::ok() returned false
*/
static bool waitFor(const std::function<bool()>& is_condition_fulfilled, const std::chrono::milliseconds& timeout,
const UpdateFunc& update_func = UpdateFunc())
Expand All @@ -136,7 +134,7 @@ static bool waitFor(const std::function<bool()>& is_condition_fulfilled, const s

if (!ros::ok())
{
throw pilz_testutils::ROSNotOkException("Expected ros::ok() to be true while waiting for some condition.");
throw std::runtime_error("Expected ros::ok() to be true while waiting for some condition.");
}

return false;
Expand Down
36 changes: 0 additions & 36 deletions pilz_testutils/include/pilz_testutils/ros_not_ok_exception.h

This file was deleted.

0 comments on commit 944f844

Please sign in to comment.