Skip to content

Commit efdfb7d

Browse files
authored
Fix CI regression (#5571)
Signed-off-by: mini-1235 <mauricepurnawan@gmail.com>
1 parent 9ed832e commit efdfb7d

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

nav2_system_tests/src/behaviors/wait/test_wait_behavior_launch.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525
from launch_ros.actions import Node
2626
from launch_testing.legacy import LaunchTestService
2727
from nav2_common.launch import RewrittenYaml
28-
from nav2_simple_commander.utils import kill_os_processes
2928

3029

3130
def generate_launch_description() -> LaunchDescription:
3231
sim_dir = get_package_share_directory('nav2_minimal_tb3_sim')
3332
nav2_bringup_dir = get_package_share_directory('nav2_bringup')
34-
ros_gz_sim_dir = get_package_share_directory('ros_gz_sim')
3533

3634
world_sdf_xacro = os.path.join(sim_dir, 'worlds', 'tb3_sandbox.sdf.xacro')
3735
robot_sdf = os.path.join(sim_dir, 'urdf', 'gz_waffle.sdf.xacro')
@@ -72,11 +70,9 @@ def generate_launch_description() -> LaunchDescription:
7270
'GZ_SIM_RESOURCE_PATH',
7371
str(Path(os.path.join(sim_dir)).parent.resolve())
7472
),
75-
IncludeLaunchDescription(
76-
PythonLaunchDescriptionSource(
77-
os.path.join(ros_gz_sim_dir, 'launch', 'gz_sim.launch.py')
78-
),
79-
launch_arguments={'gz_args': ['-r -s ', world_sdf_xacro]}.items(),
73+
ExecuteProcess(
74+
cmd=['gz', 'sim', '-r', '-s', world_sdf_xacro],
75+
output='screen',
8076
),
8177
IncludeLaunchDescription(
8278
PythonLaunchDescriptionSource(
@@ -133,7 +129,6 @@ def main(argv: list[str] = sys.argv[1:]): # type: ignore[no-untyped-def]
133129
ls = LaunchService(argv=argv)
134130
ls.include_launch_description(ld)
135131
return_code = lts.run(ls) # type: ignore[no-untyped-call]
136-
kill_os_processes('gz sim')
137132
return return_code
138133

139134

0 commit comments

Comments
 (0)