From 5b84ad22b5e3491c2758936c1fb7cc646413d17f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 13 Sep 2022 00:22:58 -0700 Subject: [PATCH] Consider regen properly in test_models (#25409) * Consider regen properly in test_models * bump panda * bump panda * can use the more interesting segment now * rm old-commit-hash: 4d351427c5a46dab100078b7e9d0737bce046e40 --- panda | 2 +- selfdrive/car/tests/routes.py | 2 +- selfdrive/car/tests/test_models.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/panda b/panda index 15eda6a7c9..788e0b5ac9 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 15eda6a7c9cf4b0c7b5a7bbde25fcab3ff0a98fc +Subproject commit 788e0b5ac944858fd9b3d2ea98e4049df0adb51b diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py index 635f43cc8d..9207859340 100644 --- a/selfdrive/car/tests/routes.py +++ b/selfdrive/car/tests/routes.py @@ -48,7 +48,7 @@ routes = [ CarTestRoute("aa20e335f61ba898|2019-02-05--16-59-04", GM.BUICK_REGAL), CarTestRoute("46460f0da08e621e|2021-10-26--07-21-46", GM.ESCALADE_ESV), CarTestRoute("c950e28c26b5b168|2018-05-30--22-03-41", GM.VOLT), - CarTestRoute("f08912a233c1584f|2022-08-11--18-02-41", GM.BOLT_EUV), + CarTestRoute("f08912a233c1584f|2022-08-11--18-02-41", GM.BOLT_EUV, segment=1), CarTestRoute("38aa7da107d5d252|2022-08-15--16-01-12", GM.SILVERADO), CarTestRoute("0e7a2ba168465df5|2020-10-18--14-14-22", HONDA.ACURA_RDX_3G), diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index fa07db92db..997a9bbec2 100755 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -243,7 +243,8 @@ class TestCarModelBase(unittest.TestCase): if CS.brakePressed and not self.safety.get_brake_pressed_prev(): if self.CP.carFingerprint in (HONDA.PILOT, HONDA.PASSPORT, HONDA.RIDGELINE) and CS.brake > 0.05: brake_pressed = False - checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev() + safety_brake_pressed = self.safety.get_brake_pressed_prev() or self.safety.get_regen_braking_prev() + checks['brakePressed'] += brake_pressed != safety_brake_pressed if self.CP.pcmCruise: # On most pcmCruise cars, openpilot's state is always tied to the PCM's cruise state.