Skip to content

Commit d20e8cc

Browse files
committed
Cleanup, test mode manager exit code
Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>
1 parent 3cd9d1e commit d20e8cc

File tree

5 files changed

+6
-27
lines changed

5 files changed

+6
-27
lines changed

system_modes/test/launchtest/modes_observer.launch.py.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,3 @@ class TestModeManagement(unittest.TestCase):
6464
output_filter=output_filter,
6565
timeout=15,
6666
stream='stdout')
67-
68-
import time
69-
time.sleep(1)

system_modes/test/launchtest/redundant_mode_changes.launch.py.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,8 @@ class TestModeManagement(unittest.TestCase):
6868
timeout=15
6969
)
7070

71-
import time
72-
time.sleep(1)
73-
7471
@launch_testing.post_shutdown_test()
7572
class TestModeManagementShutdown(unittest.TestCase):
7673

77-
def test_last_process_exit_code(self, proc_info, test_nodes):
78-
launch_testing.asserts.assertExitCodes(proc_info, process=test_nodes)
74+
def test_last_process_exit_code(self, proc_info, mode_manager):
75+
launch_testing.asserts.assertExitCodes(proc_info, process=mode_manager)

system_modes/test/launchtest/two_independent_hierarchies.launch.py.in

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,3 @@ class TestModeManagement(unittest.TestCase):
6767
output_filter=output_filter,
6868
timeout=15
6969
)
70-
71-
import time
72-
time.sleep(1)
73-
74-
@launch_testing.post_shutdown_test()
75-
class TestModeManagementShutdown(unittest.TestCase):
76-
77-
def test_last_process_exit_code(self, proc_info, test_nodes):
78-
launch_testing.asserts.assertExitCodes(proc_info, process=test_nodes)

system_modes/test/launchtest/two_lifecycle_nodes.launch.py.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,8 @@ class TestModeManagement(unittest.TestCase):
6868
timeout=15
6969
)
7070

71-
import time
72-
time.sleep(1)
73-
7471
@launch_testing.post_shutdown_test()
7572
class TestModeManagementShutdown(unittest.TestCase):
7673

77-
def test_last_process_exit_code(self, proc_info, test_nodes):
78-
launch_testing.asserts.assertExitCodes(proc_info, process=test_nodes)
74+
def test_last_process_exit_code(self, proc_info, mode_manager):
75+
launch_testing.asserts.assertExitCodes(proc_info, process=mode_manager)

system_modes/test/launchtest/two_mixed_nodes.launch.py.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,8 @@ class TestModeManagement(unittest.TestCase):
6868
timeout=15
6969
)
7070

71-
import time
72-
time.sleep(1)
73-
7471
@launch_testing.post_shutdown_test()
7572
class TestModeManagementShutdown(unittest.TestCase):
7673

77-
def test_last_process_exit_code(self, proc_info, test_nodes):
78-
launch_testing.asserts.assertExitCodes(proc_info, process=test_nodes)
74+
def test_last_process_exit_code(self, proc_info, mode_manager):
75+
launch_testing.asserts.assertExitCodes(proc_info, process=mode_manager)

0 commit comments

Comments
 (0)