selfdrive/debug: fix broken check_can_parser_performance.py (#33908)

* fix check_can_parser_performance.py

* no difference

* this too

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
pull/33920/head
Dean Lee 6 months ago committed by GitHub
parent 4c0e2926e4
commit 6fc14b5b93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      selfdrive/car/tests/test_models.py
  2. 1
      selfdrive/debug/check_can_parser_performance.py
  3. 7
      tools/car_porting/test_car_model.py

@ -93,7 +93,7 @@ class TestCarModelBase(unittest.TestCase):
car_fw = msg.carParams.carFw car_fw = msg.carParams.carFw
if msg.carParams.openpilotLongitudinalControl: if msg.carParams.openpilotLongitudinalControl:
experimental_long = True experimental_long = True
if cls.platform is None and not cls.test_route_on_bucket: if cls.platform is None:
live_fingerprint = msg.carParams.carFingerprint live_fingerprint = msg.carParams.carFingerprint
cls.platform = MIGRATION.get(live_fingerprint, live_fingerprint) cls.platform = MIGRATION.get(live_fingerprint, live_fingerprint)

@ -14,7 +14,6 @@ N_RUNS = 10
class CarModelTestCase(TestCarModelBase): class CarModelTestCase(TestCarModelBase):
test_route = CarTestRoute(DEMO_ROUTE, None) test_route = CarTestRoute(DEMO_ROUTE, None)
ci = False
if __name__ == '__main__': if __name__ == '__main__':

@ -8,11 +8,11 @@ from openpilot.selfdrive.car.tests.test_models import TestCarModel
from openpilot.tools.lib.route import SegmentRange from openpilot.tools.lib.route import SegmentRange
def create_test_models_suite(routes: list[CarTestRoute], ci=False) -> unittest.TestSuite: def create_test_models_suite(routes: list[CarTestRoute]) -> unittest.TestSuite:
test_suite = unittest.TestSuite() test_suite = unittest.TestSuite()
for test_route in routes: for test_route in routes:
# create new test case and discover tests # create new test case and discover tests
test_case_args = {"platform": test_route.car_model, "test_route": test_route, "test_route_on_bucket": ci} test_case_args = {"platform": test_route.car_model, "test_route": test_route}
CarModelTestCase = type("CarModelTestCase", (TestCarModel,), test_case_args) CarModelTestCase = type("CarModelTestCase", (TestCarModel,), test_case_args)
test_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(CarModelTestCase)) test_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(CarModelTestCase))
return test_suite return test_suite
@ -23,7 +23,6 @@ if __name__ == "__main__":
"Uses selfdrive/car/tests/test_models.py") "Uses selfdrive/car/tests/test_models.py")
parser.add_argument("route_or_segment_name", help="Specify route to run tests on") parser.add_argument("route_or_segment_name", help="Specify route to run tests on")
parser.add_argument("--car", help="Specify car model for test route") parser.add_argument("--car", help="Specify car model for test route")
parser.add_argument("--ci", action="store_true", help="Attempt to get logs using openpilotci, need to specify car")
args = parser.parse_args() args = parser.parse_args()
if len(sys.argv) == 1: if len(sys.argv) == 1:
parser.print_help() parser.print_help()
@ -32,6 +31,6 @@ if __name__ == "__main__":
sr = SegmentRange(args.route_or_segment_name) sr = SegmentRange(args.route_or_segment_name)
test_routes = [CarTestRoute(sr.route_name, args.car, segment=seg_idx) for seg_idx in sr.seg_idxs] test_routes = [CarTestRoute(sr.route_name, args.car, segment=seg_idx) for seg_idx in sr.seg_idxs]
test_suite = create_test_models_suite(test_routes, ci=args.ci) test_suite = create_test_models_suite(test_routes)
unittest.TextTestRunner().run(test_suite) unittest.TextTestRunner().run(test_suite)

Loading…
Cancel
Save