diff --git a/launch_testing/test/launch_testing/examples/args_launch_test.py b/launch_testing/test/launch_testing/examples/args_launch_test.py index 891efeeda..710762123 100644 --- a/launch_testing/test/launch_testing/examples/args_launch_test.py +++ b/launch_testing/test/launch_testing/examples/args_launch_test.py @@ -23,6 +23,7 @@ import launch.substitutions import launch_testing +import launch_testing.actions import launch_testing.util import pytest @@ -44,7 +45,7 @@ @pytest.mark.launch_test -def generate_test_description(ready_fn): +def generate_test_description(): return launch.LaunchDescription([ @@ -63,7 +64,7 @@ def generate_test_description(ready_fn): # provides a simple launch action that does this: launch_testing.util.KeepAliveProc(), - launch.actions.OpaqueFunction(function=lambda context: ready_fn()) + launch_testing.actions.ReadyToTest() ]) diff --git a/launch_testing/test/launch_testing/examples/context_launch_test.py b/launch_testing/test/launch_testing/examples/context_launch_test.py index 64de150b3..b5e08b0ca 100644 --- a/launch_testing/test/launch_testing/examples/context_launch_test.py +++ b/launch_testing/test/launch_testing/examples/context_launch_test.py @@ -22,6 +22,7 @@ import launch.actions import launch_testing +import launch_testing.actions from launch_testing.asserts import assertSequentialStdout import pytest @@ -45,14 +46,14 @@ def get_test_process_action(): # adding them to the test context, it's not necessary to scope them at the module level like in # the good_proc.test.py example @pytest.mark.launch_test -def generate_test_description(ready_fn): +def generate_test_description(): dut_process = get_test_process_action() ld = launch.LaunchDescription([ dut_process, # Start tests right away - no need to wait for anything - launch.actions.OpaqueFunction(function=lambda context: ready_fn()), + launch_testing.actions.ReadyToTest(), ]) # Items in this dictionary will be added to the test cases as an attribute based on diff --git a/launch_testing/test/launch_testing/examples/parameters_launch_test.py b/launch_testing/test/launch_testing/examples/parameters_launch_test.py index 04bc73aaf..78a471927 100644 --- a/launch_testing/test/launch_testing/examples/parameters_launch_test.py +++ b/launch_testing/test/launch_testing/examples/parameters_launch_test.py @@ -21,6 +21,7 @@ import launch import launch.actions import launch_testing +import launch_testing.actions import launch_testing.util import pytest @@ -28,7 +29,7 @@ @pytest.mark.launch_test @launch_testing.parametrize('arg_param', ['thing=On', 'thing=Off', 'flag1']) -def generate_test_description(arg_param, ready_fn): +def generate_test_description(arg_param): terminating_process = launch.actions.ExecuteProcess( cmd=[ @@ -48,7 +49,7 @@ def generate_test_description(arg_param, ready_fn): launch.LaunchDescription([ terminating_process, launch_testing.util.KeepAliveProc(), - launch.actions.OpaqueFunction(function=lambda context: ready_fn()) + launch_testing.actions.ReadyToTest(), ]), {'dut_process': terminating_process} ) diff --git a/launch_testing/test/launch_testing/examples/terminating_proc_launch_test.py b/launch_testing/test/launch_testing/examples/terminating_proc_launch_test.py index 9a693f33b..0a7876a94 100644 --- a/launch_testing/test/launch_testing/examples/terminating_proc_launch_test.py +++ b/launch_testing/test/launch_testing/examples/terminating_proc_launch_test.py @@ -22,6 +22,7 @@ import launch.actions import launch_testing +import launch_testing.actions import launch_testing.asserts import launch_testing.markers import launch_testing.tools @@ -46,10 +47,8 @@ def get_test_process_action(*, args=[]): @pytest.mark.launch_test @launch_testing.markers.keep_alive -def generate_test_description(ready_fn): - return launch.LaunchDescription([ - launch.actions.OpaqueFunction(function=lambda context: ready_fn()), - ]) +def generate_test_description(): + return launch.LaunchDescription([launch_testing.actions.ReadyToTest()]) class TestTerminatingProc(unittest.TestCase):