From 487189dae59c3d44df2b73a7ae871923103686dd Mon Sep 17 00:00:00 2001
From: Comma Device <device@comma.ai>
Date: Sun, 22 Jan 2023 16:26:55 -0600
Subject: [PATCH] test manager: use ensure_running to start relevant procs

old-commit-hash: 42937056481be5959664d00c8dd0a78220574695
---
 selfdrive/manager/process.py           |  6 +++++-
 selfdrive/manager/test/test_manager.py | 27 +++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/selfdrive/manager/process.py b/selfdrive/manager/process.py
index dabfbe4ee0..ce18073d9b 100644
--- a/selfdrive/manager/process.py
+++ b/selfdrive/manager/process.py
@@ -290,10 +290,11 @@ class DaemonProcess(ManagerProcess):
 
 
 def ensure_running(procs: ValuesView[ManagerProcess], started: bool, params=None, CP: car.CarParams=None,
-                   not_run: Optional[List[str]]=None) -> None:
+                   not_run: Optional[List[str]]=None) -> List[ManagerProcess]:
   if not_run is None:
     not_run = []
 
+  running = []
   for p in procs:
     # Conditions that make a process run
     run = any((
@@ -311,7 +312,10 @@ def ensure_running(procs: ValuesView[ManagerProcess], started: bool, params=None
 
     if run:
       p.start()
+      running.append(p)
     else:
       p.stop(block=False)
 
     p.check_watchdog(started)
+
+  return running
diff --git a/selfdrive/manager/test/test_manager.py b/selfdrive/manager/test/test_manager.py
index 6d4df0423a..8712c9478e 100755
--- a/selfdrive/manager/test/test_manager.py
+++ b/selfdrive/manager/test/test_manager.py
@@ -4,17 +4,17 @@ import signal
 import time
 import unittest
 
+from cereal import car
 from common.params import Params
 import selfdrive.manager.manager as manager
-from selfdrive.manager.process import DaemonProcess
+from selfdrive.manager.process import ensure_running, DaemonProcess
 from selfdrive.manager.process_config import managed_processes
 from system.hardware import HARDWARE
 
 os.environ['FAKEUPLOAD'] = "1"
 
 MAX_STARTUP_TIME = 3
-ALL_PROCESSES = [p.name for p in managed_processes.values() if (type(p) is not DaemonProcess) and p.enabled and (p.name not in ['pandad', ])]
-
+BLACKLIST_PROCS = ['manage_athenad', 'pandad', 'pigeond']
 
 class TestManager(unittest.TestCase):
   def setUp(self):
@@ -47,24 +47,25 @@ class TestManager(unittest.TestCase):
     HARDWARE.set_power_save(False)
     manager.manager_init()
     manager.manager_prepare()
-    for p in ALL_PROCESSES:
-      managed_processes[p].start()
+
+    CP = car.CarParams.new_message()
+    procs = ensure_running(managed_processes.values(), True, Params(), CP, not_run=BLACKLIST_PROCS)
 
     time.sleep(10)
 
-    for p in reversed(ALL_PROCESSES):
-      with self.subTest(proc=p):
-        state = managed_processes[p].get_process_state_msg()
-        self.assertTrue(state.running, f"{p} not running")
-        exit_code = managed_processes[p].stop(retry=False)
+    for p in procs:
+      with self.subTest(proc=p.name):
+        state = p.get_process_state_msg()
+        self.assertTrue(state.running, f"{p.name} not running")
+        exit_code = p.stop(retry=False)
 
-        self.assertTrue(exit_code is not None, f"{p} failed to exit")
+        self.assertTrue(exit_code is not None, f"{p.name} failed to exit")
 
         # TODO: interrupted blocking read exits with 1 in cereal. use a more unique return code
         exit_codes = [0, 1]
-        if managed_processes[p].sigkill:
+        if p.sigkill:
           exit_codes = [-signal.SIGKILL]
-        self.assertIn(exit_code, exit_codes, f"{p} died with {exit_code}")
+        self.assertIn(exit_code, exit_codes, f"{p.name} died with {exit_code}")
 
 
 if __name__ == "__main__":