Bump submodules (#34616)

* bump

* now libsafety

* skip rivian for now
pull/34615/head^2
Shane Smiskol 2 months ago committed by GitHub
parent a30d3f7d72
commit 8e19185cee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      opendbc_repo
  2. 2
      panda
  3. 14
      selfdrive/car/tests/test_models.py
  4. 2
      selfdrive/test/process_replay/test_processes.py

@ -1 +1 @@
Subproject commit 130bf3183f4ab871ee8dd56b122cfbb038542606 Subproject commit 87a51e38b53d91075419f01b4cd2e625ee7d4516

@ -1 +1 @@
Subproject commit 978ee190051806f8e5b7b8fede6b6be4e4db4aae Subproject commit 2a4d3a9923bc5f972d8cdd9df4375252ff49234f

@ -26,7 +26,7 @@ from openpilot.tools.lib.logreader import LogReader, LogsUnavailable, openpilotc
internal_source_zst, comma_api_source, auto_source internal_source_zst, comma_api_source, auto_source
from openpilot.tools.lib.route import SegmentName from openpilot.tools.lib.route import SegmentName
from panda.tests.libpanda import libpanda_py from panda.tests.libsafety import libsafety_py
SafetyModel = car.CarParams.SafetyModel SafetyModel = car.CarParams.SafetyModel
@ -169,7 +169,7 @@ class TestCarModelBase(unittest.TestCase):
assert self.CI assert self.CI
# TODO: check safetyModel is in release panda build # TODO: check safetyModel is in release panda build
self.safety = libpanda_py.libpanda self.safety = libsafety_py.libsafety
cfg = self.CP.safetyConfigs[-1] cfg = self.CP.safetyConfigs[-1]
set_status = self.safety.set_safety_hooks(cfg.safetyModel.raw, cfg.safetyParam) set_status = self.safety.set_safety_hooks(cfg.safetyModel.raw, cfg.safetyParam)
@ -241,7 +241,7 @@ class TestCarModelBase(unittest.TestCase):
if msg.src >= 64: if msg.src >= 64:
continue continue
to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat)
if self.safety.safety_rx_hook(to_send) != 1: if self.safety.safety_rx_hook(to_send) != 1:
failed_addrs[hex(msg.address)] += 1 failed_addrs[hex(msg.address)] += 1
@ -280,7 +280,7 @@ class TestCarModelBase(unittest.TestCase):
now_nanos += DT_CTRL * 1e9 now_nanos += DT_CTRL * 1e9
msgs_sent += len(sendcan) msgs_sent += len(sendcan)
for addr, dat, bus in sendcan: for addr, dat, bus in sendcan:
to_send = libpanda_py.make_CANPacket(addr, bus % 4, dat) to_send = libsafety_py.make_CANPacket(addr, bus % 4, dat)
self.assertTrue(self.safety.safety_tx_hook(to_send), (addr, dat, bus)) self.assertTrue(self.safety.safety_tx_hook(to_send), (addr, dat, bus))
# Make sure we attempted to send messages # Make sure we attempted to send messages
@ -331,7 +331,7 @@ class TestCarModelBase(unittest.TestCase):
prev_panda_cruise_engaged = self.safety.get_cruise_engaged_prev() prev_panda_cruise_engaged = self.safety.get_cruise_engaged_prev()
prev_panda_acc_main_on = self.safety.get_acc_main_on() prev_panda_acc_main_on = self.safety.get_acc_main_on()
to_send = libpanda_py.make_CANPacket(address, bus, dat) to_send = libsafety_py.make_CANPacket(address, bus, dat)
self.safety.safety_rx_hook(to_send) self.safety.safety_rx_hook(to_send)
can = [(int(time.monotonic() * 1e9), [CanData(address=address, dat=dat, src=bus)])] can = [(int(time.monotonic() * 1e9), [CanData(address=address, dat=dat, src=bus)])]
@ -374,7 +374,7 @@ class TestCarModelBase(unittest.TestCase):
for can in self.can_msgs[:300]: for can in self.can_msgs[:300]:
self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), ))) self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), )))
for msg in filter(lambda m: m.src in range(64), can.can): for msg in filter(lambda m: m.src in range(64), can.can):
to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat)
self.safety.safety_rx_hook(to_send) self.safety.safety_rx_hook(to_send)
controls_allowed_prev = False controls_allowed_prev = False
@ -383,7 +383,7 @@ class TestCarModelBase(unittest.TestCase):
for idx, can in enumerate(self.can_msgs): for idx, can in enumerate(self.can_msgs):
CS = self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), ))).as_reader() CS = self.CI.update(can_capnp_to_list((can.as_builder().to_bytes(), ))).as_reader()
for msg in filter(lambda m: m.src in range(64), can.can): for msg in filter(lambda m: m.src in range(64), can.can):
to_send = libpanda_py.make_CANPacket(msg.address, msg.src % 4, msg.dat) to_send = libsafety_py.make_CANPacket(msg.address, msg.src % 4, msg.dat)
ret = self.safety.safety_rx_hook(to_send) ret = self.safety.safety_rx_hook(to_send)
self.assertEqual(1, ret, f"safety rx failed ({ret=}): {(msg.address, msg.src % 4)}") self.assertEqual(1, ret, f"safety rx failed ({ret=}): {(msg.address, msg.src % 4)}")

@ -60,7 +60,7 @@ segments = [
] ]
# dashcamOnly makes don't need to be tested until a full port is done # dashcamOnly makes don't need to be tested until a full port is done
excluded_interfaces = ["mock", "tesla"] excluded_interfaces = ["mock", "tesla", "rivian"]
BASE_URL = "https://commadataci.blob.core.windows.net/openpilotci/" BASE_URL = "https://commadataci.blob.core.windows.net/openpilotci/"
REF_COMMIT_FN = os.path.join(PROC_REPLAY_DIR, "ref_commit") REF_COMMIT_FN = os.path.join(PROC_REPLAY_DIR, "ref_commit")

Loading…
Cancel
Save