sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing Hondas and Toyotas to tests (#21044)

Browse Source 
* Add new route for Acura ILX

* Add Lexus RXH

* Add CRV Hybrid route

* Add Insight route

* update sync script

* Add Avalon route with rlogs

* Update CRV route

* Update Pilot 2019 route

* Add Camry Hybrid 2018 route

* Add 2017 Highlander

* Add 2018 Highlander Hybrid

* Add TSS2 Highlander Hybrid

* Add Accord Hybrid

* Repalce old Accord

* Update Lexus RXH route with logs, CHR+H, skip Avalon for now (fixup in another PR)

* Add CRV

* How did I miss this!

* add exception for CRV Hybrid

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 997319fac1
commatwo_master
ShaneSmiskol 4 years ago committed by GitHub
parent c8f01a6728
commit c2b41b8b55
3 changed files with 32 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      selfdrive/test/test_models.py
  2. 52
      selfdrive/test/test_routes.py
  3. 3
      selfdrive/test/update_ci_routes.py

19
selfdrive/test/test_models.py
Unescape View File

@ -11,7 +11,6 @@ from selfdrive.car.fingerprints import all_known_cars
from selfdrive.car.car_helpers import interfaces
from selfdrive.car.honda.values import HONDA_BOSCH
from selfdrive.car.honda.values import CAR as HONDA
from selfdrive.car.toyota.values import CAR as TOYOTA
from selfdrive.car.chrysler.values import CAR as CHRYSLER
from selfdrive.car.hyundai.values import CAR as HYUNDAI
from selfdrive.test.test_routes import routes, non_tested_cars
@ -27,27 +26,12 @@ ROUTES = {v['carFingerprint']: k for k, v in routes.items() if 'enableCamera' no
# TODO: get updated routes for these cars
ignore_can_valid = [
HONDA.ACURA_ILX,
TOYOTA.LEXUS_RXH,
TOYOTA.AVALON,
HONDA.PILOT_2019,
HYUNDAI.SANTA_FE,
# TODO: get new routes for these cars, current routes are from giraffe with different buses
HONDA.CRV_HYBRID,
HONDA.INSIGHT,
HONDA.ACCORDH,
]
ignore_carstate_check = [
# TODO: chrysler gas state in panda also checks wheel speed, refactor so it's only gas
CHRYSLER.PACIFICA_2017_HYBRID,
# TODO: get new routes for these cars, current routes are from giraffe with different buses
HONDA.CRV_HYBRID,
HONDA.ACCORD,
HONDA.INSIGHT,
HONDA.ACCORDH,
]
@parameterized_class(('car_model'), [(car,) for car in all_known_cars()])
@ -194,7 +178,8 @@ class TestCarModel(unittest.TestCase):
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 self.car_model not in HONDA_BOSCH:
if "brakePressed" in failed_checks and self.car_model.startswith(("HONDA", "ACURA")) and \
(self.car_model not in HONDA_BOSCH or self.car_model == HONDA.CRV_HYBRID):
if failed_checks['brakePressed'] < 150:
del failed_checks['brakePressed']

52
selfdrive/test/test_routes.py
Unescape View File

@ -19,19 +19,12 @@ non_tested_cars = [
GM.CADILLAC_ATS,
GM.HOLDEN_ASTRA,
GM.MALIBU,
HONDA.CRV,
HYUNDAI.ELANTRA,
HYUNDAI.ELANTRA_GT_I30,
HYUNDAI.GENESIS_G90,
HYUNDAI.KIA_FORTE,
HYUNDAI.KIA_OPTIMA_H,
HYUNDAI.KONA_EV,
TOYOTA.CAMRYH,
TOYOTA.CHR,
TOYOTA.CHRH,
TOYOTA.HIGHLANDER,
TOYOTA.HIGHLANDERH,
TOYOTA.HIGHLANDERH_TSS2,
]
routes: dict = {
@ -80,7 +73,11 @@ routes: dict = {
'carFingerprint': HONDA.CRV_EU,
'enableCamera': True,
},
"232585b7784c1af4|2019-04-08--14-12-14": {
"68aac44ad69f838e|2021-05-18--20-40-52": {
'carFingerprint': HONDA.CRV,
'enableCamera': True,
},
"14fed2e5fa0aa1a5|2021-05-25--14-59-42": {
'carFingerprint': HONDA.CRV_HYBRID,
'enableCamera': True,
},
@ -92,7 +89,7 @@ routes: dict = {
'carFingerprint': HONDA.HRV,
'enableCamera': True,
},
"2ac95059f70d76eb|2018-02-05--15-03-29": {
"917b074700869333|2021-05-24--20-40-20": {
'carFingerprint': HONDA.ACURA_ILX,
'enableCamera': True,
},
@ -108,11 +105,11 @@ routes: dict = {
'carFingerprint': HONDA.ACCORD_15,
'enableCamera': True,
},
"a8e8bf6a3864361b|2021-04-20--12-09-18": {
"1da5847ac2488106|2021-05-24--19-31-50": {
'carFingerprint': HONDA.ACCORD,
'enableCamera': True,
},
"690c4c9f9f2354c7|2018-09-15--17-36-05": {
"07585b0da3c88459|2021-05-26--18-52-04": {
'carFingerprint': HONDA.ACCORDH,
'enableCamera': True,
},
@ -128,7 +125,7 @@ routes: dict = {
'carFingerprint': HONDA.CIVIC_BOSCH_DIESEL,
'enableCamera': True,
},
"fb51d190ddfd8a90|2020-02-25--14-43-43": {
"f0890d16a07a236b|2021-05-25--17-27-22": {
'carFingerprint': HONDA.INSIGHT,
'enableCamera': True,
},
@ -136,7 +133,7 @@ routes: dict = {
'carFingerprint': HONDA.PILOT,
'enableCamera': True,
},
"22affd6c545d985e|2020-03-08--01-08-09": {
"fa1cd231131ca137|2021-05-22--07-59-57": {
'carFingerprint': HONDA.PILOT_2019,
'enableCamera': True,
},
@ -232,9 +229,9 @@ routes: dict = {
'carFingerprint': HYUNDAI.ELANTRA_2021,
'enableCamera': True,
},
"f7b6be73e3dfd36c|2019-05-12--18-07-16": {
"000cf3730200c71c|2021-05-24--10-42-05": {
'carFingerprint': TOYOTA.AVALON,
'enableCamera': False,
'enableCamera': True,
'enableDsu': False,
},
"6cdecc4728d4af37|2020-02-23--15-44-18": {
@ -252,10 +249,8 @@ routes: dict = {
'enableCamera': True,
'enableDsu': False,
},
"f7b6be73e3dfd36c|2019-05-11--22-34-20": {
'carFingerprint': TOYOTA.AVALON,
'enableCamera': True,
'enableDsu': False,
"54034823d30962f5|2021-05-24--06-37-34": {
'carFingerprint': TOYOTA.CAMRYH,
},
"4e45c89c38e8ec4d|2021-05-02--02-49-28": {
'carFingerprint': TOYOTA.COROLLA,
@ -343,7 +338,7 @@ routes: dict = {
'enableCamera': True,
'enableDsu': False,
},
"b0f5a01cf604185c|2018-02-01--21-12-28": {
"d27ad752e9b08d4f|2021-05-26--19-39-51": {
'carFingerprint': TOYOTA.LEXUS_RXH,
'enableCamera': True,
'enableDsu': True,
@ -380,10 +375,15 @@ routes: dict = {
'enableCamera': True,
'enableDsu': False,
},
"aa659debdd1a7b54|2018-08-31--11-12-01": {
"437e4d2402abf524|2021-05-25--07-58-50": {
'carFingerprint': TOYOTA.HIGHLANDERH_TSS2,
},
"3183cd9b021e89ce|2021-05-25--10-34-44": {
'carFingerprint': TOYOTA.HIGHLANDER,
'enableCamera': False,
'enableDsu': False,
'enableCamera': True,
},
"80d16a262e33d57f|2021-05-23--20-01-43": {
'carFingerprint': TOYOTA.HIGHLANDERH,
},
"eb6acd681135480d|2019-06-20--20-00-00": {
'carFingerprint': TOYOTA.SIENNA,
@ -410,6 +410,12 @@ routes: dict = {
'enableCamera': True,
'enableDsu': False,
},
"cd9cff4b0b26c435|2021-05-13--15-12-39": {
'carFingerprint': TOYOTA.CHR,
},
"57858ede0369a261|2021-05-18--20-34-20": {
'carFingerprint': TOYOTA.CHRH,
},
"2c68dda277d887ac|2021-05-11--15-22-20": {
'carFingerprint': VOLKSWAGEN.ATLAS_MK1,
'enableCamera': True,

3
selfdrive/test/update_ci_routes.py
Unescape View File

@ -19,14 +19,13 @@ SOURCE_KEYS = [azureutil.get_user_token(account, bucket) for account, bucket in
SERVICE = BlockBlobService(_DATA_ACCOUNT_CI, sas_token=DEST_KEY)
def sync_to_ci_public(route):
print(f"Uploading {route}")
key_prefix = route.replace('|', '/')
dongle_id = key_prefix.split('/')[0]
if next(azureutil.list_all_blobs(SERVICE, "openpilotci", prefix=key_prefix), None) is not None:
print("Already synced")
return True
print(f"Uploading {route}")
for (source_account, source_bucket), source_key in zip(SOURCES, SOURCE_KEYS):
print(f"Trying {source_account}/{source_bucket}")
cmd = [

Write Preview
Loading…
Cancel
Save