From 711b61dcd59709ec55c75f1fd51fb8b78e1e71d8 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Wed, 30 Mar 2016 17:42:12 -0700 Subject: [PATCH] fixup tests to match changes in launch and rclpy --- rclpy/test/test_select_rmw_implementation.py | 4 ++-- rclpy/test/test_talker_listener.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rclpy/test/test_select_rmw_implementation.py b/rclpy/test/test_select_rmw_implementation.py index 0a74770c7..a02484fe2 100644 --- a/rclpy/test/test_select_rmw_implementation.py +++ b/rclpy/test/test_select_rmw_implementation.py @@ -56,7 +56,7 @@ def func_import_each_available_rmw_implementation(rmw_implementation): return ctypes.c_bool(True) raise - set_rmw = rclpy.get_implementation_identifier() + set_rmw = rclpy.get_rmw_implementation_identifier() assert set_rmw in identifiers_map, \ "expected identifier '{0}' to be in the map '{1}'".format(set_rmw, identifiers_map) @@ -106,7 +106,7 @@ def func_select_rmw_implementation_by_environment(rmw_implementation): .format(rmw_implementation), file=sys.stderr) raise - set_rmw = rclpy.get_implementation_identifier() + set_rmw = rclpy.get_rmw_implementation_identifier() assert set_rmw in identifiers_map, \ "expected identifier '{0}' to be in the map '{1}'".format(set_rmw, identifiers_map) diff --git a/rclpy/test/test_talker_listener.py b/rclpy/test/test_talker_listener.py index 567309393..b53946fe9 100644 --- a/rclpy/test/test_talker_listener.py +++ b/rclpy/test/test_talker_listener.py @@ -58,7 +58,7 @@ def test_talker_listener(): node.create_subscription(String, 'chatter', chatter_callback, qos_profile_default) spin_count = 0 - while len(received_messages) == 0 and spin_count < 10 and launcher.launch_is_running(): + while len(received_messages) == 0 and spin_count < 10 and launcher.is_launch_running(): rclpy.spin_once(node) # This will wait 1 second or until something has been done. spin_count += 1