Skip to content

Commit c6b48f5

Browse files
cottsaycottsay
authored
Restore environment variables after launch tests (#1086)
These tests change the process environment variables using the SetEnvironmentVariable action. We should reset the variables when the test concludes to avoid stepping on other tests that execute in the same pytest process. Signed-off-by: Scott K Logan <[email protected]>
1 parent aed5b49 commit c6b48f5

File tree

12 files changed

+48
-0
lines changed

12 files changed

+48
-0
lines changed

‎ros2action/test/test_cli.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020

2121
from launch import LaunchDescription
2222
from launch.actions import ExecuteProcess
23+
from launch.actions import RegisterEventHandler
24+
from launch.actions import ResetEnvironment
2325
from launch.actions import SetEnvironmentVariable
26+
from launch.event_handlers import OnShutdown
2427

2528
import launch_testing
2629
import launch_testing.actions
@@ -60,6 +63,7 @@ def generate_test_description(rmw_implementation):
6063
cmd=['ros2', 'daemon', 'stop'],
6164
name='daemon-stop',
6265
on_exit=[
66+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
6367
*set_env_actions,
6468
EnableRmwIsolation(),
6569
ExecuteProcess(

‎ros2action/test/test_echo.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
from launch import LaunchDescription
2323
from launch.actions import ExecuteProcess
24+
from launch.actions import RegisterEventHandler
25+
from launch.actions import ResetEnvironment
2426
from launch.actions import SetEnvironmentVariable
27+
from launch.event_handlers import OnShutdown
2528

2629
import launch_testing
2730
import launch_testing.actions
@@ -230,6 +233,7 @@ def generate_test_description(rmw_implementation):
230233
cmd=['ros2', 'daemon', 'stop'],
231234
name='daemon-stop',
232235
on_exit=[
236+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
233237
*set_env_actions,
234238
EnableRmwIsolation(),
235239
ExecuteProcess(

‎ros2doctor/test/test_qos_compatibility.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
from launch import LaunchDescription
2121
from launch.actions import ExecuteProcess
22+
from launch.actions import RegisterEventHandler
23+
from launch.actions import ResetEnvironment
2224
from launch.actions import SetEnvironmentVariable
25+
from launch.event_handlers import OnShutdown
2326

2427
from launch_ros.actions import Node
2528

@@ -88,6 +91,7 @@ def generate_test_description(rmw_implementation):
8891
cmd=['ros2', 'daemon', 'stop'],
8992
name='daemon-stop',
9093
on_exit=[
94+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
9195
*set_env_actions,
9296
EnableRmwIsolation(),
9397
ExecuteProcess(

‎ros2lifecycle/test/test_cli.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919
from launch import LaunchDescription
2020
from launch.actions import ExecuteProcess
21+
from launch.actions import RegisterEventHandler
22+
from launch.actions import ResetEnvironment
2123
from launch.actions import SetEnvironmentVariable
24+
from launch.event_handlers import OnShutdown
2225
from launch_ros.actions import Node
2326

2427
import launch_testing
@@ -133,6 +136,7 @@ def generate_test_description(rmw_implementation):
133136
cmd=['ros2', 'daemon', 'stop'],
134137
name='daemon-stop',
135138
on_exit=[
139+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
136140
*set_env_actions,
137141
EnableRmwIsolation(),
138142
ExecuteProcess(

‎ros2node/test/test_cli.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
from launch import LaunchDescription
2323
from launch.actions import ExecuteProcess
24+
from launch.actions import RegisterEventHandler
25+
from launch.actions import ResetEnvironment
2426
from launch.actions import SetEnvironmentVariable
27+
from launch.event_handlers import OnShutdown
2528

2629
from launch_ros.actions import Node
2730

@@ -61,6 +64,7 @@ def generate_test_description(rmw_implementation):
6164
cmd=['ros2', 'daemon', 'stop'],
6265
name='daemon-stop',
6366
on_exit=[
67+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
6468
*set_env_actions,
6569
EnableRmwIsolation(),
6670
ExecuteProcess(

‎ros2node/test/test_cli_duplicate_node_names.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
from launch import LaunchDescription
2121
from launch.actions import ExecuteProcess
22+
from launch.actions import RegisterEventHandler
23+
from launch.actions import ResetEnvironment
2224
from launch.actions import SetEnvironmentVariable
25+
from launch.event_handlers import OnShutdown
2326

2427
from launch_ros.actions import Node
2528

@@ -60,6 +63,7 @@ def generate_test_description(rmw_implementation):
6063
cmd=['ros2', 'daemon', 'stop'],
6164
name='daemon-stop',
6265
on_exit=[
66+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
6367
*set_env_actions,
6468
EnableRmwIsolation(),
6569
ExecuteProcess(

‎ros2param/test/test_verb_dump.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
from launch import LaunchDescription
2323
from launch.actions import ExecuteProcess
24+
from launch.actions import RegisterEventHandler
25+
from launch.actions import ResetEnvironment
2426
from launch.actions import SetEnvironmentVariable
27+
from launch.event_handlers import OnShutdown
2528
from launch_ros.actions import Node
2629
import launch_testing
2730
import launch_testing.actions
@@ -105,6 +108,7 @@ def generate_test_description(rmw_implementation):
105108
cmd=['ros2', 'daemon', 'stop'],
106109
name='daemon-stop',
107110
on_exit=[
111+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
108112
*set_env_actions,
109113
EnableRmwIsolation(),
110114
ExecuteProcess(

‎ros2param/test/test_verb_list.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
from launch import LaunchDescription
2323
from launch.actions import ExecuteProcess
24+
from launch.actions import RegisterEventHandler
25+
from launch.actions import ResetEnvironment
2426
from launch.actions import SetEnvironmentVariable
27+
from launch.event_handlers import OnShutdown
2528
from launch_ros.actions import Node
2629
import launch_testing
2730
import launch_testing.actions
@@ -75,6 +78,7 @@ def generate_test_description(rmw_implementation):
7578
cmd=['ros2', 'daemon', 'stop'],
7679
name='daemon-stop',
7780
on_exit=[
81+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
7882
*set_env_actions,
7983
EnableRmwIsolation(),
8084
ExecuteProcess(

‎ros2param/test/test_verb_load.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222

2323
from launch import LaunchDescription
2424
from launch.actions import ExecuteProcess
25+
from launch.actions import RegisterEventHandler
26+
from launch.actions import ResetEnvironment
2527
from launch.actions import SetEnvironmentVariable
28+
from launch.event_handlers import OnShutdown
2629
from launch_ros.actions import Node
2730
import launch_testing
2831
import launch_testing.actions
@@ -125,6 +128,7 @@ def generate_test_description(rmw_implementation):
125128
cmd=['ros2', 'daemon', 'stop'],
126129
name='daemon-stop',
127130
on_exit=[
131+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
128132
*set_env_actions,
129133
EnableRmwIsolation(),
130134
ExecuteProcess(

‎ros2service/test/test_cli.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
from launch import LaunchDescription
2323
from launch.actions import ExecuteProcess
24+
from launch.actions import RegisterEventHandler
25+
from launch.actions import ResetEnvironment
2426
from launch.actions import SetEnvironmentVariable
27+
from launch.event_handlers import OnShutdown
2528
from launch_ros.actions import Node
2629

2730
import launch_testing
@@ -78,6 +81,7 @@ def generate_test_description(rmw_implementation):
7881
cmd=['ros2', 'daemon', 'stop'],
7982
name='daemon-stop',
8083
on_exit=[
84+
RegisterEventHandler(OnShutdown(on_shutdown=ResetEnvironment())),
8185
*set_env_actions,
8286
EnableRmwIsolation(),
8387
ExecuteProcess(

0 commit comments

Comments
 (0)