Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
opennav_docking
nav2_lifecycle_manager
nav2_loopback_sim
nav2_map_server
arguments: --config tools/pyproject.toml

pre-commit:
Expand Down
2 changes: 1 addition & 1 deletion nav2_map_server/launch/map_saver_server.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import launch_ros.actions


def generate_launch_description():
def generate_launch_description() -> LaunchDescription:
# Parameters
lifecycle_nodes = ['map_saver']
use_sim_time = True
Expand Down
10 changes: 6 additions & 4 deletions nav2_map_server/test/component/test_map_saver_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
from launch_testing.legacy import LaunchTestService


def main(argv=sys.argv[1:]):
launchFile = os.path.join(os.getenv('TEST_LAUNCH_DIR'), 'map_saver_node.launch.py')
testExecutable = os.getenv('TEST_EXECUTABLE')
def main(argv: list[str] = sys.argv[1:]): # type: ignore[no-untyped-def]
launchDir = os.getenv('TEST_LAUNCH_DIR', '')
testExecutable = os.getenv('TEST_EXECUTABLE', '')

launchFile = os.path.join(launchDir, 'map_saver_node.launch.py')
ld = LaunchDescription(
[
IncludeLaunchDescription(PythonLaunchDescriptionSource([launchFile])),
Expand All @@ -39,7 +41,7 @@ def main(argv=sys.argv[1:]):
lts.add_test_action(ld, test1_action)
ls = LaunchService(argv=argv)
ls.include_launch_description(ld)
os.chdir(os.getenv('TEST_LAUNCH_DIR'))
os.chdir(launchDir)
return lts.run(ls)


Expand Down
10 changes: 6 additions & 4 deletions nav2_map_server/test/component/test_map_server_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
from launch_testing.legacy import LaunchTestService


def main(argv=sys.argv[1:]):
launchFile = os.path.join(os.getenv('TEST_LAUNCH_DIR'), 'map_server_node.launch.py')
testExecutable = os.getenv('TEST_EXECUTABLE')
def main(argv: list[str] = sys.argv[1:]): # type: ignore[no-untyped-def]
launchDir = os.getenv('TEST_LAUNCH_DIR', '')
testExecutable = os.getenv('TEST_EXECUTABLE', '')

launchFile = os.path.join(launchDir, 'map_server_node.launch.py')
ld = LaunchDescription(
[
IncludeLaunchDescription(PythonLaunchDescriptionSource([launchFile])),
Expand All @@ -39,7 +41,7 @@ def main(argv=sys.argv[1:]):
lts.add_test_action(ld, test1_action)
ls = LaunchService(argv=argv)
ls.include_launch_description(ld)
os.chdir(os.getenv('TEST_LAUNCH_DIR'))
os.chdir(launchDir)
return lts.run(ls)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import launch_ros.actions


def generate_launch_description():
def generate_launch_description() -> LaunchDescription:
map_publisher = (
f"{os.path.dirname(os.getenv('TEST_EXECUTABLE'))}/test_map_saver_publisher"
f"{os.path.dirname(os.getenv('TEST_EXECUTABLE', ''))}/test_map_saver_publisher"
)

ld = LaunchDescription()
Expand All @@ -32,7 +32,7 @@ def generate_launch_description():
package='nav2_map_server',
executable='map_saver_server',
output='screen',
parameters=[os.path.join(os.getenv('TEST_DIR'), 'map_saver_params.yaml')],
parameters=[os.path.join(os.getenv('TEST_DIR', ''), 'map_saver_params.yaml')],
)

map_publisher_cmd = ExecuteProcess(cmd=[map_publisher])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
import launch_ros.actions


def generate_launch_description():
def generate_launch_description() -> LaunchDescription:
return LaunchDescription(
[
launch_ros.actions.Node(
package='nav2_map_server',
executable='map_server',
output='screen',
parameters=[
os.path.join(os.getenv('TEST_DIR'), 'map_server_params.yaml')
os.path.join(os.getenv('TEST_DIR', ''), 'map_server_params.yaml')
],
)
]
Expand Down
Loading