Skip to content

Commit f3752a0

Browse files
committed
Removed test of tool contact
1 parent 43b6433 commit f3752a0

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

Diff for: ur_robot_driver/test/integration_test.py

-31
Original file line numberDiff line numberDiff line change
@@ -128,22 +128,6 @@ def init_robot(self):
128128
"Could not reach 'get version' service. Make sure that the driver is actually running."
129129
" Msg: {}".format(err))
130130

131-
self.start_tool_contact = rospy.ServiceProxy('ur_hardware_interface/start_tool_contact', Trigger)
132-
try:
133-
self.start_tool_contact.wait_for_service(timeout)
134-
except rospy.exceptions.ROSException as err:
135-
self.fail(
136-
"Could not reach 'start tool contact' service. Make sure that the driver is actually running."
137-
" Msg: {}".format(err))
138-
139-
self.end_tool_contact = rospy.ServiceProxy('ur_hardware_interface/end_tool_contact', Trigger)
140-
try:
141-
self.end_tool_contact.wait_for_service(timeout)
142-
except rospy.exceptions.ROSException as err:
143-
self.fail(
144-
"Could not reach 'end tool contact' service. Make sure that the driver is actually running."
145-
" Msg: {}".format(err))
146-
147131
self.script_publisher = rospy.Publisher("/ur_hardware_interface/script_command", std_msgs.msg.String, queue_size=1)
148132
self.tf_listener = tf.TransformListener()
149133
self.twist_pub = rospy.Publisher("/twist_controller/command", geometry_msgs.msg.Twist, queue_size=1)
@@ -286,21 +270,6 @@ def test_set_io(self):
286270
messages += 1
287271
self.assertEqual(pin_state, 1)
288272

289-
def test_tool_contact(self):
290-
version_info = self.get_robot_software_version.call()
291-
if version_info.major >= 5:
292-
start_response = self.start_tool_contact.call()
293-
self.assertEqual(start_response.success,True)
294-
295-
end_response = self.end_tool_contact.call()
296-
self.assertEqual(end_response.success, True)
297-
else:
298-
start_response = self.start_tool_contact.call()
299-
self.assertEqual(start_response.success,False)
300-
301-
end_response = self.end_tool_contact.call()
302-
self.assertEqual(end_response.success, False)
303-
304273
def test_cartesian_passthrough(self):
305274
#### Power cycle the robot in order to make sure it is running correctly####
306275
self.assertTrue(self.set_robot_to_mode(RobotMode.POWER_OFF))

0 commit comments

Comments
 (0)