From a0b67f51c3cb5d0222056d8d66d46dc4f25ba3d5 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Wed, 11 Sep 2019 21:33:46 +0300 Subject: [PATCH] aruco_pose: Allow rgb8 map images (again) --- aruco_pose/test/basic.py | 2 +- aruco_pose/test/largemap.py | 2 +- aruco_pose/test/test_parser_pass.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aruco_pose/test/basic.py b/aruco_pose/test/basic.py index 60f35af2..c8eca6c3 100755 --- a/aruco_pose/test/basic.py +++ b/aruco_pose/test/basic.py @@ -140,7 +140,7 @@ def test_map_image(node): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) assert img.width == 2000 assert img.height == 2000 - assert (img.encoding == 'mono8') or (img.encoding == 'rgb8') + assert img.encoding in ('mono8', 'rgb8') def test_map_markers(node): markers = rospy.wait_for_message('aruco_map/markers', MarkerArray, timeout=5) diff --git a/aruco_pose/test/largemap.py b/aruco_pose/test/largemap.py index 8ca1b065..56e06837 100755 --- a/aruco_pose/test/largemap.py +++ b/aruco_pose/test/largemap.py @@ -17,7 +17,7 @@ class TestArucoPose(unittest.TestCase): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) self.assertEqual(img.width, 2000) self.assertEqual(img.height, 2000) - self.assertEqual(img.encoding, 'mono8') + self.assertIn(img.encoding, ('mono8', 'rgb8')) def test_map_visualization(self): vis = rospy.wait_for_message('aruco_map/visualization', VisMarkerArray, timeout=5) diff --git a/aruco_pose/test/test_parser_pass.py b/aruco_pose/test/test_parser_pass.py index a504544a..1537a1ab 100755 --- a/aruco_pose/test/test_parser_pass.py +++ b/aruco_pose/test/test_parser_pass.py @@ -58,4 +58,4 @@ def test_map_image(node): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) assert img.width == 2000 assert img.height == 2000 - assert img.encoding == 'mono8' + assert img.encoding in ('mono8', 'rgb8')