Merge pull request #1774 from k-okada/fix_noetic

jsk-ros-pkg · Apr 10, 2023 · 60acb83 · 60acb83
2 parents b82d738 + 8c221f7
commit 60acb83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/jsk_ros_patch/image_view2/test/publish_mouse_event.py b/jsk_ros_patch/image_view2/test/publish_mouse_event.py
@@ -14,17 +14,17 @@ def main():
     pub_plus = rospy.Publisher('~plus_rect_event', MouseEvent, queue_size=1)
     pub_minus = rospy.Publisher('~minus_rect_event', MouseEvent, queue_size=1)
 
-    width = rospy.get_param('~image_width')
-    height = rospy.get_param('~image_height')
+    width = int(rospy.get_param('~image_width'))
+    height = int(rospy.get_param('~image_height'))
     plus_events = [
-        MouseEvent(type=3, x=width/4, y=height/4, width=width, height=height),
-        MouseEvent(type=4, x=width/2, y=height/2, width=width, height=height),
-        MouseEvent(type=2, x=3*width/4, y=3*height/4, width=width, height=height),
+        MouseEvent(type=3, x=int(width/4), y=int(height/4), width=width, height=height),
+        MouseEvent(type=4, x=int(width/2), y=int(height/2), width=width, height=height),
+        MouseEvent(type=2, x=int(3*width/4), y=int(3*height/4), width=width, height=height),
     ]
     minus_events = [
-        MouseEvent(type=3, x=3*width/4, y=3*height/4, width=width, height=height),
-        MouseEvent(type=4, x=width/2, y=height/2, width=width, height=height),
-        MouseEvent(type=2, x=width/4, y=height/4, width=width, height=height),
+        MouseEvent(type=3, x=int(3*width/4), y=int(3*height/4), width=width, height=height),
+        MouseEvent(type=4, x=int(width/2), y=int(height/2), width=width, height=height),
+        MouseEvent(type=2, x=int(width/4), y=int(height/4), width=width, height=height),
     ]
     rate = rospy.Rate(10)
     while not rospy.is_shutdown():

diff --git a/jsk_topic_tools/test/test_transform_wrench.test b/jsk_topic_tools/test/test_transform_wrench.test
@@ -6,7 +6,8 @@
 
   <test test-name="test_transform_wrench"
         name="test_transform_wrench"
-        pkg="jsk_tools" type="test_topic_published.py">
+        pkg="jsk_tools" type="test_topic_published.py"
+        retry="3" time-limit="15" >
     <rosparam>
       topic_0: /right_endeffector/transformed_wrench
       timeout_0: 10