From eee5af9baaf2a8d46bb0c4f8599e223cd0eb8ed2 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Thu, 8 Feb 2024 14:31:55 -0500 Subject: [PATCH] test_power_draw: combine mapsd and navmodeld (#31375) * combine * combine * combine * simpler * nounion old-commit-hash: 70288d1742c2cc84f4419f3411056d81bad4b59b --- system/hardware/tici/tests/test_power_draw.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/system/hardware/tici/tests/test_power_draw.py b/system/hardware/tici/tests/test_power_draw.py index 7cc17fa68b..f6c0cf21a4 100755 --- a/system/hardware/tici/tests/test_power_draw.py +++ b/system/hardware/tici/tests/test_power_draw.py @@ -22,19 +22,23 @@ MAX_WARMUP_TIME = 30 # seconds to wait for SAMPLE_TIME consecutive valid sample @dataclass class Proc: - name: str + procs: List[str] power: float msgs: List[str] rtol: float = 0.05 atol: float = 0.12 + @property + def name(self): + return '+'.join(self.procs) + + PROCS = [ - Proc('camerad', 2.1, msgs=['roadCameraState', 'wideRoadCameraState', 'driverCameraState']), - Proc('modeld', 1.12, atol=0.2, msgs=['modelV2']), - Proc('dmonitoringmodeld', 0.4, msgs=['driverStateV2']), - Proc('encoderd', 0.23, msgs=[]), - Proc('mapsd', 0.05, msgs=['mapRenderState']), - Proc('navmodeld', 0.05, msgs=['navModel']), + Proc(['camerad'], 2.1, msgs=['roadCameraState', 'wideRoadCameraState', 'driverCameraState']), + Proc(['modeld'], 1.12, atol=0.2, msgs=['modelV2']), + Proc(['dmonitoringmodeld'], 0.4, msgs=['driverStateV2']), + Proc(['encoderd'], 0.23, msgs=[]), + Proc(['mapsd', 'navmodeld'], 0.05, msgs=['mapRenderState', 'navModel']), ] @@ -105,7 +109,8 @@ class TestPowerDraw(unittest.TestCase): msg_counts = {} for proc in PROCS: - managed_processes[proc.name].start() + for p in proc.procs: + managed_processes[p].start() now, local_msg_counts, warmup_time[proc.name] = self.get_power_with_warmup_for_target(proc, prev) msg_counts.update(local_msg_counts)