Skip to content

Commit 5d59523

Browse files
committed
skip history and depth check for rmw_connextdds.
Signed-off-by: Tomoya Fujita <[email protected]>
1 parent b9f066f commit 5d59523

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

ros2cli/test/test_ros2cli_daemon.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import rclpy
2020
import rclpy.action
2121

22+
from rclpy.utilities import get_rmw_implementation_identifier
23+
2224
from ros2cli.node.daemon import DaemonNode
2325
from ros2cli.node.daemon import is_daemon_running
2426
from ros2cli.node.daemon import shutdown_daemon
@@ -214,8 +216,11 @@ def test_get_publishers_info_by_topic(daemon_node):
214216
TEST_TOPIC_PUBLISHER_QOS.durability
215217
assert test_publisher_info.qos_profile.reliability == \
216218
TEST_TOPIC_PUBLISHER_QOS.reliability
217-
assert test_publisher_info.qos_profile.history == \
218-
TEST_TOPIC_PUBLISHER_QOS.history
219+
if get_rmw_implementation_identifier() != 'rmw_connextdds':
220+
# rmw_connextdds does not collect the QoS history from discovery.
221+
# See more details for https://github.com/ros2/ros2cli/issues/1054
222+
assert test_publisher_info.qos_profile.history == \
223+
TEST_TOPIC_PUBLISHER_QOS.history
219224

220225

221226
def test_get_subscriptions_info_by_topic(daemon_node):
@@ -229,10 +234,13 @@ def test_get_subscriptions_info_by_topic(daemon_node):
229234
TEST_TOPIC_SUBSCRIPTION_QOS.durability
230235
assert test_subscription_info.qos_profile.reliability == \
231236
TEST_TOPIC_SUBSCRIPTION_QOS.reliability
232-
assert test_subscription_info.qos_profile.history == \
233-
TEST_TOPIC_SUBSCRIPTION_QOS.history
234-
assert test_subscription_info.qos_profile.depth == \
235-
TEST_TOPIC_SUBSCRIPTION_QOS.depth
237+
if get_rmw_implementation_identifier() != 'rmw_connextdds':
238+
# rmw_connextdds does not collect the QoS history and depth from discovery
239+
# See more details for https://github.com/ros2/ros2cli/issues/1054
240+
assert test_subscription_info.qos_profile.history == \
241+
TEST_TOPIC_SUBSCRIPTION_QOS.history
242+
assert test_subscription_info.qos_profile.depth == \
243+
TEST_TOPIC_SUBSCRIPTION_QOS.depth
236244

237245

238246
def test_count_publishers(daemon_node):

0 commit comments

Comments
 (0)