niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ready_fn and self.proc_info will be removed in future (#522)

Browse source 
Signed-off-by: Pete Baughman <pete.baughman@apex.ai>
This commit is contained in:
Peter Baughman 2019-10-18 17:14:22 -07:00 • committed by Shane Loretz
parent a073507182
commit 7859398e97
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rcl/test/rcl/test_rmw_impl_id_check.py.in
View file

@ -7,6 +7,7 @@ from launch.actions import ExecuteProcess
from launch.actions import OpaqueFunction from launch.actions import OpaqueFunction
import launch_testing import launch_testing
import launch_testing.actions
import launch_testing.asserts import launch_testing.asserts
import launch_testing.util import launch_testing.util
@ -33,7 +34,6 @@ import unittest
def generate_test_description( def generate_test_description(
rmw_implementation_env, rmw_implementation_env,
rcl_assert_rmw_id_matches_env, rcl_assert_rmw_id_matches_env,
ready_fn
): ):
launch_description = LaunchDescription() launch_description = LaunchDescription()
@ -52,15 +52,15 @@ def generate_test_description(
# Keep the test fixture alive till tests end. # Keep the test fixture alive till tests end.
launch_description.add_action(launch_testing.util.KeepAliveProc()) launch_description.add_action(launch_testing.util.KeepAliveProc())
launch_description.add_action( launch_description.add_action(
OpaqueFunction(function=lambda context: ready_fn()) launch_testing.actions.ReadyToTest()
) )
return launch_description, locals() return launch_description, locals()
class TestRMWImplementationIDCheck(unittest.TestCase): class TestRMWImplementationIDCheck(unittest.TestCase):
def test_process_terminates_in_a_finite_amount_of_time(self, executable_under_test): def test_process_terminates_in_a_finite_amount_of_time(self, executable_under_test, proc_info):
"""Test that executable under test terminates in a finite amount of time.""" """Test that executable under test terminates in a finite amount of time."""
self.proc_info.assertWaitForShutdown(process=executable_under_test, timeout=10) proc_info.assertWaitForShutdown(process=executable_under_test, timeout=10)
@launch_testing.post_shutdown_test() @launch_testing.post_shutdown_test()
class TestRMWImplementationIDCheckAfterShutdown(unittest.TestCase): class TestRMWImplementationIDCheckAfterShutdown(unittest.TestCase):

13
rcl/test/rcl/test_two_executables.py.in
View file

@ -7,12 +7,13 @@ from launch.actions import ExecuteProcess
from launch.actions import OpaqueFunction from launch.actions import OpaqueFunction
import launch_testing import launch_testing
import launch_testing.actions
import launch_testing.asserts import launch_testing.asserts
import unittest import unittest
def generate_test_description(ready_fn): def generate_test_description():
launch_description = LaunchDescription() launch_description = LaunchDescription()
launch_description.add_action( launch_description.add_action(
@ -29,25 +30,25 @@ def generate_test_description(ready_fn):
launch_description.add_action(executable_under_test) launch_description.add_action(executable_under_test)
launch_description.add_action( launch_description.add_action(
OpaqueFunction(function=lambda context: ready_fn()) launch_testing.actions.ReadyToTest()
) )
return launch_description, locals() return launch_description, locals()
class TestTwoExecutables(unittest.TestCase): class TestTwoExecutables(unittest.TestCase):
def @TEST_NAME@(self, executable_under_test): def @TEST_NAME@(self, executable_under_test, proc_info):
"""Test that the executable under test terminates after a finite amount of time.""" """Test that the executable under test terminates after a finite amount of time."""
self.proc_info.assertWaitForShutdown(process=executable_under_test, timeout=10) proc_info.assertWaitForShutdown(process=executable_under_test, timeout=10)
@launch_testing.post_shutdown_test() @launch_testing.post_shutdown_test()
class TestTwoExecutablesAfterShutdown(unittest.TestCase): class TestTwoExecutablesAfterShutdown(unittest.TestCase):
def @TEST_NAME@(self, executable_under_test): def @TEST_NAME@(self, executable_under_test, proc_info):
"""Test that the executable under test finished cleanly.""" """Test that the executable under test finished cleanly."""
launch_testing.asserts.assertExitCodes( launch_testing.asserts.assertExitCodes(
self.proc_info, proc_info,
[launch_testing.asserts.EXIT_OK], [launch_testing.asserts.EXIT_OK],
executable_under_test executable_under_test
) )