Skip to content

Commit 7de2247

Browse files
committed
Changes for local testing (should be reverted)
1 parent 487a556 commit 7de2247

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

ur_robot_driver/test/test_common.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@
4040
DeclareLaunchArgument,
4141
ExecuteProcess,
4242
IncludeLaunchDescription,
43-
RegisterEventHandler,
43+
# RegisterEventHandler,
4444
)
45-
from launch.event_handlers import OnProcessExit
45+
46+
# from launch.event_handlers import OnProcessExit
4647
from launch.launch_description_sources import PythonLaunchDescriptionSource
4748
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
4849
from launch_ros.substitutions import FindPackagePrefix, FindPackageShare
@@ -387,7 +388,7 @@ def generate_driver_test_description(
387388
ur_type = LaunchConfiguration("ur_type")
388389

389390
launch_arguments = {
390-
"robot_ip": "192.168.56.101",
391+
"robot_ip": "172.17.0.3",
391392
"ur_type": ur_type,
392393
"launch_rviz": "false",
393394
"controller_spawner_timeout": str(controller_spawner_timeout),
@@ -408,20 +409,17 @@ def generate_driver_test_description(
408409
),
409410
launch_arguments=launch_arguments.items(),
410411
)
411-
wait_dashboard_server = ExecuteProcess(
412-
cmd=[
413-
PathJoinSubstitution(
414-
[FindPackagePrefix("ur_robot_driver"), "bin", "wait_dashboard_server.sh"]
415-
)
416-
],
417-
name="wait_dashboard_server",
418-
output="screen",
419-
)
420-
driver_starter = RegisterEventHandler(
421-
OnProcessExit(target_action=wait_dashboard_server, on_exit=robot_driver)
422-
)
423-
424-
return LaunchDescription(
425-
_declare_launch_arguments()
426-
+ [ReadyToTest(), wait_dashboard_server, _ursim_action(), driver_starter]
427-
)
412+
# wait_dashboard_server = ExecuteProcess(
413+
# cmd=[
414+
# PathJoinSubstitution(
415+
# [FindPackagePrefix("ur_robot_driver"), "bin", "wait_dashboard_server.sh"]
416+
# )
417+
# ],
418+
# name="wait_dashboard_server",
419+
# output="screen",
420+
# )
421+
# driver_starter = RegisterEventHandler(
422+
# OnProcessExit(target_action=wait_dashboard_server, on_exit=robot_driver)
423+
# )
424+
425+
return LaunchDescription(_declare_launch_arguments() + [ReadyToTest(), robot_driver])

0 commit comments

Comments
 (0)