diff --git a/selfdrive/test/test_models.py b/selfdrive/test/test_models.py index 2bfd676e81..bdc63a0e26 100755 --- a/selfdrive/test/test_models.py +++ b/selfdrive/test/test_models.py @@ -173,12 +173,13 @@ class TestCarModel(unittest.TestCase): failed_checks = {k: v for k, v in checks.items() if v > 25} # TODO: the panda and openpilot interceptor thresholds should match - if "gasPressed" in failed_checks and self.CP.enableGasInterceptor: - if failed_checks['gasPressed'] < 150: + skip_gas_check = self.CP.carName == 'chrysler' + if "gasPressed" in failed_checks and (self.CP.enableGasInterceptor or skip_gas_check): + if failed_checks['gasPressed'] < 150 or skip_gas_check: del failed_checks['gasPressed'] # TODO: honda nidec: do same checks in carState and panda - if "brakePressed" in failed_checks and self.car_model.startswith(("HONDA", "ACURA")) and \ + if "brakePressed" in failed_checks and self.CP.carName == 'honda' and \ (self.car_model not in HONDA_BOSCH or self.car_model == HONDA.CRV_HYBRID): if failed_checks['brakePressed'] < 150: del failed_checks['brakePressed'] diff --git a/selfdrive/test/test_routes.py b/selfdrive/test/test_routes.py index 26b772fb70..92c6dbd1da 100755 --- a/selfdrive/test/test_routes.py +++ b/selfdrive/test/test_routes.py @@ -14,10 +14,6 @@ from selfdrive.car.volkswagen.values import CAR as VOLKSWAGEN # TODO: add routes for these cars non_tested_cars = [ - CHRYSLER.JEEP_CHEROKEE_2019, - CHRYSLER.PACIFICA_2018, - CHRYSLER.PACIFICA_2018_HYBRID, - CHRYSLER.PACIFICA_2020, GM.CADILLAC_ATS, GM.HOLDEN_ASTRA, GM.MALIBU, @@ -31,8 +27,12 @@ TestRoute = namedtuple('TestRoute', ['route', 'car_fingerprint']) routes = [ TestRoute("0c94aa1e1296d7c6|2021-05-05--19-48-37", CHRYSLER.JEEP_CHEROKEE), + TestRoute("91dfedae61d7bd75|2021-05-22--20-07-52", CHRYSLER.JEEP_CHEROKEE_2019), TestRoute("420a8e183f1aed48|2020-03-05--07-15-29", CHRYSLER.PACIFICA_2017_HYBRID), + TestRoute("43a685a66291579b|2021-05-27--19-47-29", CHRYSLER.PACIFICA_2018), + TestRoute("378472f830ee7395|2021-05-28--07-38-43", CHRYSLER.PACIFICA_2018_HYBRID), TestRoute("8190c7275a24557b|2020-01-29--08-33-58", CHRYSLER.PACIFICA_2019_HYBRID), + TestRoute("3d84727705fecd04|2021-05-25--08-38-56", CHRYSLER.PACIFICA_2020), TestRoute("f1b4c567731f4a1b|2018-04-30--10-15-35", FORD.FUSION),