Skip to content

Commit

Permalink
Move pytest entrypoints to own module
Browse files Browse the repository at this point in the history
Signed-off-by: Shane Loretz <sloretz@openrobotics.org>
  • Loading branch information
sloretz committed Oct 27, 2021
1 parent d31044d commit 5b2b52d
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 14 deletions.
13 changes: 0 additions & 13 deletions launch_testing_ros/launch_testing_ros/pytest/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,3 @@ class LaunchROSTestModule(LaunchTestModule):

def makeitem(self, *args, **kwargs):
return LaunchROSTestItem.from_parent(*args, **kwargs)


def pytest_launch_collect_makemodule(path, parent, entrypoint):
marks = getattr(entrypoint, 'pytestmark', [])
if marks and any(m.name == 'rostest' for m in marks):
return LaunchROSTestModule.from_parent(parent=parent, fspath=path)


def pytest_configure(config):
config.addinivalue_line(
'markers',
'rostest: mark a generate_test_description function as a ROS launch test entrypoint'
)
32 changes: 32 additions & 0 deletions launch_testing_ros/launch_testing_ros_pytest_entrypoint.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Copyright 2019 Open Source Robotics Foundation, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Only import standard python modules here
# This module intentionally delays imports as late as possible to avoid
# importing downstream modules in upstream packages when built with a merged
# workspace.


def pytest_launch_collect_makemodule(path, parent, entrypoint):
marks = getattr(entrypoint, 'pytestmark', [])
if marks and any(m.name == 'rostest' for m in marks):
from launch_testing_ros.pytest.hooks import LaunchROSTestModule
return LaunchROSTestModule.from_parent(parent=parent, fspath=path)


def pytest_configure(config):
config.addinivalue_line(
'markers',
'rostest: mark a generate_test_description function as a ROS launch test entrypoint'
)
3 changes: 2 additions & 1 deletion launch_testing_ros/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
name='launch_testing_ros',
version='0.15.0',
packages=find_packages(exclude=['test']),
py_modules=['launch_testing_ros_pytest_entrypoint'],
data_files=[
('share/ament_index/resource_index/packages', ['resource/launch_testing_ros']),
('share/launch_testing_ros', ['package.xml']),
('share/launch_testing_ros/examples', glob.glob('test/examples/[!_]*.*')),
],
entry_points={
'pytest11': ['launch_ros = launch_testing_ros.pytest.hooks'],
'pytest11': ['launch_ros = launch_testing_ros_pytest_entrypoint'],
},
install_requires=['setuptools'],
zip_safe=True,
Expand Down

0 comments on commit 5b2b52d

Please sign in to comment.