Improve coverage of rmw tests

osrf · Jan 24, 2025 · 6c6bc2d · 6c6bc2d
1 parent 2f2f9dc
commit 6c6bc2d
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/test/test_rmw_extension.py b/test/test_rmw_extension.py
@@ -84,19 +84,16 @@ def test_rmw_extension(self):
         plugins = list_plugins()
         rmw_plugin = plugins['rmw']
 
+        rmws_to_test = ['fastrtps', 'cyclonedds', 'zenoh']
+
         p = rmw_plugin()
         self.assertTrue(plugin_load_parser_correctly(rmw_plugin))
 
-        mock_cliargs = {'rmw': ['cyclonedds']}
-        dig = DockerImageGenerator([rmw_plugin()], mock_cliargs, 'ros:rolling')
-        self.assertEqual(dig.build(), 0)
-        self.assertEqual(dig.run(command='dpkg -l ros-rolling-rmw-cyclonedds-cpp'), 0)
-        self.assertIn('-e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp', dig.generate_docker_cmd('', mode='dry-run'))
-        dig.clear_image()
-
-        mock_cliargs = {'rmw': ['zenoh']}
-        dig = DockerImageGenerator([rmw_plugin()], mock_cliargs, 'ros:rolling')
-        self.assertEqual(dig.build(), 0)
-        self.assertEqual(dig.run(command='dpkg -l ros-rolling-rmw-zenoh-cpp'), 0)
-        self.assertIn('-e RMW_IMPLEMENTATION=rmw_zenoh_cpp', dig.generate_docker_cmd('', mode='dry-run'))
-        dig.clear_image()
+
+        for rmw_name in rmws_to_test:
+            mock_cliargs = {'rmw': [rmw_name]}
+            dig = DockerImageGenerator([rmw_plugin()], mock_cliargs, 'ros:rolling')
+            self.assertEqual(dig.build(), 10, msg=f'dig.build for rmw {rmw_name} failed')
+            self.assertEqual(dig.run(command=f'dpkg -l ros-rolling-rmw-{rmw_name}-cpp'), 0)
+            self.assertIn(f'-e RMW_IMPLEMENTATION=rmw_{rmw_name}_cpp', dig.generate_docker_cmd('', mode='dry-run'))
+            dig.clear_image()