Catch the new unsupported platform/accessory exceptions raised by the…

… generator so the tests pass, use the envar when setting the default value of ROS_DISTRO
clearpathrobotics · Nov 6, 2024 · 84e6e6e · 84e6e6e
1 parent 6fa195e
commit 84e6e6e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/clearpath_generator_common/clearpath_generator_common/ros.py b/clearpath_generator_common/clearpath_generator_common/ros.py
@@ -27,8 +27,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-## The ROS distrbution this package has been bloomed for
-ROS_DISTRO = 'jazzy'
+import os
 
-## Standard installation path for ROS distributions
-ROS_DISTRO_PATH = f'/opt/ros/{ROS_DISTRO}/'
+# The active ROS distribution
+ROS_DISTRO = os.environ.get('ROS_DISTRO', 'jazzy')
+
+# Standard installation path for ROS distributions
+ROS_DISTRO_PATH = f'/opt/ros/{ROS_DISTRO}/'
diff --git a/clearpath_generator_common/test/test_generator_bash.py b/clearpath_generator_common/test/test_generator_bash.py
@@ -29,6 +29,10 @@
 import shutil
 
 from ament_index_python.packages import get_package_share_directory
+from clearpath_config.common.types.exception import (
+    UnsupportedAccessoryException,
+    UnsupportedPlatformException,
+)
 from clearpath_generator_common.bash.generator import BashGenerator
 
 
@@ -49,6 +53,10 @@ def test_samples(self):
             try:
                 rlg = BashGenerator(os.path.dirname(dst))
                 rlg.generate()
+            except UnsupportedAccessoryException as e:
+                print(f'Unsupported accessory: {e}')
+            except UnsupportedPlatformException as e:
+                print(f'Unsupported platform: {e}')
             except Exception as e:
                 errors.append("Sample '%s' failed to load: '%s'" % (
                     sample,

diff --git a/clearpath_generator_common/test/test_generator_description.py b/clearpath_generator_common/test/test_generator_description.py
@@ -30,6 +30,10 @@
 
 from ament_index_python.packages import get_package_share_directory
 
+from clearpath_config.common.types.exception import (
+    UnsupportedAccessoryException,
+    UnsupportedPlatformException,
+)
 from clearpath_generator_common.description.generator import DescriptionGenerator
 
 import xacro
@@ -52,6 +56,12 @@ def test_samples(self):
             try:
                 rlg = DescriptionGenerator(os.path.dirname(dst))
                 rlg.generate()
+            except UnsupportedAccessoryException as e:
+                print(f'Unsupported accessory. {e}. Skipping')
+                continue
+            except UnsupportedPlatformException as e:
+                print(f'Unsupported platform. {e}. Skipping')
+                continue
             except Exception as e:
                 errors.append("Sample '%s' failed to load: '%s'" % (
                     sample,

diff --git a/clearpath_generator_common/test/test_generator_discovery_server.py b/clearpath_generator_common/test/test_generator_discovery_server.py
@@ -29,6 +29,10 @@
 import shutil
 
 from ament_index_python.packages import get_package_share_directory
+from clearpath_config.common.types.exception import (
+    UnsupportedAccessoryException,
+    UnsupportedPlatformException,
+)
 from clearpath_generator_common.discovery_server.generator import DiscoveryServerGenerator
 
 
@@ -49,6 +53,10 @@ def test_samples(self):
             try:
                 rlg = DiscoveryServerGenerator(os.path.dirname(dst))
                 rlg.generate()
+            except UnsupportedAccessoryException as e:
+                print(f'Unsupported accessory. {e}')
+            except UnsupportedPlatformException as e:
+                print(f'Unsupported platform. {e}')
             except Exception as e:
                 errors.append("Sample '%s' failed to load: '%s'" % (
                     sample,