From 9eee6ca556f2ce2cfb63071994efee7c03f29d54 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 9 Jun 2020 16:50:46 -0700 Subject: [PATCH] update safety tests after DBC changes --- Dockerfile.panda | 2 +- tests/safety/test_mazda.py | 2 +- tests/safety/test_subaru.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.panda b/Dockerfile.panda index e5830d3..85b20c6 100644 --- a/Dockerfile.panda +++ b/Dockerfile.panda @@ -59,7 +59,7 @@ RUN cd /tmp && \ RUN cd /tmp && \ git clone https://github.com/commaai/openpilot.git tmppilot || true && \ cd /tmp/tmppilot && \ - git pull && git checkout 44560b5bb74e451767725144c3fa5f1564481a20 && \ + git pull && git checkout a777fa851e8a444cadb516fc4e35b641018f0559 && \ git submodule update --init cereal opendbc && \ mkdir /tmp/openpilot && \ cp -pR SConstruct tools/ selfdrive/ common/ cereal/ opendbc/ /tmp/openpilot && \ diff --git a/tests/safety/test_mazda.py b/tests/safety/test_mazda.py index 60f7038..3cff13c 100755 --- a/tests/safety/test_mazda.py +++ b/tests/safety/test_mazda.py @@ -28,7 +28,7 @@ class TestMazdaSafety(common.PandaSafetyTest): LKAS_DISABLE_SPEED = 45 def setUp(self): - self.packer = CANPackerPanda("mazda_cx5_gt_2017") + self.packer = CANPackerPanda("mazda_2017") self.safety = libpandasafety_py.libpandasafety self.safety.set_safety_hooks(Panda.SAFETY_MAZDA, 0) self.safety.init_tests() diff --git a/tests/safety/test_subaru.py b/tests/safety/test_subaru.py index 965240d..9b20e27 100644 --- a/tests/safety/test_subaru.py +++ b/tests/safety/test_subaru.py @@ -42,7 +42,7 @@ class TestSubaruSafety(common.PandaSafetyTest): self.safety.set_rt_torque_last(t) def _torque_driver_msg(self, torque): - values = {"Steer_Torque_Sensor": torque, "counter": self.cnt_torque_driver % 4} + values = {"Steer_Torque_Sensor": torque, "Counter": self.cnt_torque_driver % 4} self.__class__.cnt_torque_driver += 1 return self.packer.make_can_msg_panda("Steering_Torque", 0, values)