From 1fe1523fc24f4d38fded125a20b6d32b7f3c4534 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Thu, 4 Jan 2024 20:52:07 -0500 Subject: [PATCH] add read_seglist helper (#30908) add helper old-commit-hash: 1148c65d232fdfe7aa46b80c078721d78876da4a --- selfdrive/car/tests/test_models.py | 10 ++++------ selfdrive/test/helpers.py | 7 +++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index cc52995a33..253841877f 100755 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -21,6 +21,7 @@ from openpilot.selfdrive.car.car_helpers import FRAME_FINGERPRINT, interfaces from openpilot.selfdrive.car.honda.values import CAR as HONDA, HONDA_BOSCH from openpilot.selfdrive.car.tests.routes import non_tested_cars, routes, CarTestRoute from openpilot.selfdrive.controls.controlsd import Controls +from openpilot.selfdrive.test.helpers import read_segment_list from openpilot.selfdrive.test.openpilotci import get_url from openpilot.tools.lib.logreader import LogReader from openpilot.tools.lib.route import Route, SegmentName, RouteName @@ -52,12 +53,9 @@ def get_test_cases() -> List[Tuple[str, Optional[CarTestRoute]]]: test_cases.extend(sorted((c.value, r) for r in routes_by_car.get(c, (None,)))) else: - with open(os.path.join(BASEDIR, INTERNAL_SEG_LIST), "r") as f: - seg_list = f.read().splitlines() - - seg_list_grouped = [(platform[2:], segment) for platform, segment in zip(seg_list[::2], seg_list[1::2], strict=True)] - seg_list_grouped = random.sample(seg_list_grouped, INTERNAL_SEG_CNT or len(seg_list_grouped)) - for platform, segment in seg_list_grouped: + segment_list = read_segment_list(os.path.join(BASEDIR, INTERNAL_SEG_LIST)) + segment_list = random.sample(segment_list, INTERNAL_SEG_CNT or len(segment_list)) + for platform, segment in segment_list: segment_name = SegmentName(segment) test_cases.append((platform, CarTestRoute(segment_name.route_name.canonical_name, platform, segment=segment_name.segment_num))) diff --git a/selfdrive/test/helpers.py b/selfdrive/test/helpers.py index 78b01c983f..134f1150b8 100644 --- a/selfdrive/test/helpers.py +++ b/selfdrive/test/helpers.py @@ -72,3 +72,10 @@ def with_processes(processes, init_time=0, ignore_stopped=None): def noop(*args, **kwargs): pass + + +def read_segment_list(segment_list_path): + with open(segment_list_path, "r") as f: + seg_list = f.read().splitlines() + + return [(platform[2:], segment) for platform, segment in zip(seg_list[::2], seg_list[1::2], strict=True)]