Clean qos zenoh tests (#1369)

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros2 · Oct 11, 2024 · a09a031 · a09a031
1 parent 4d7ff97
commit a09a031
Show file tree

Hide file tree

Showing 2 changed files with 199 additions and 176 deletions.
diff --git a/rclpy/test/test_qos.py b/rclpy/test/test_qos.py
@@ -16,6 +16,7 @@
 import warnings
 
 from rclpy.duration import Duration
+from rclpy.impl.implementation_singleton import rclpy_implementation as _rclpy
 from rclpy.qos import InvalidQoSProfileException
 from rclpy.qos import qos_check_compatible
 from rclpy.qos import qos_profile_system_default
@@ -187,8 +188,12 @@ def test_incompatible(self):
             pub_qos, sub_qos
         )
 
-        assert compatibility == QoSCompatibility.ERROR
-        assert reason != ''
+        if _rclpy.rclpy_get_rmw_implementation_identifier() != 'rmw_zenoh_cpp':
+            assert compatibility == QoSCompatibility.ERROR
+            assert reason != ''
+        else:
+            assert compatibility == QoSCompatibility.OK
+            assert reason == ''
 
     def test_warn_of_possible_incompatibility(self):
         """
@@ -206,5 +211,9 @@ def test_warn_of_possible_incompatibility(self):
             pub_qos, sub_qos
         )
 
-        assert compatibility == QoSCompatibility.WARNING
-        assert reason != ''
+        if _rclpy.rclpy_get_rmw_implementation_identifier() != 'rmw_zenoh_cpp':
+            assert compatibility == QoSCompatibility.WARNING
+            assert reason != ''
+        else:
+            assert compatibility == QoSCompatibility.OK
+            assert reason == ''