Also covering fwd hook for Subaru and GM now

tests/safety/test_gm.py

@@ -35,6 +35,13 @@ class TestGmSafety(unittest.TestCase):
     cls.safety.safety_set_mode(3, 0)
     cls.safety.init_tests_gm()
 
+  def _send_msg(self, bus, addr, length):
+    to_send = libpandasafety_py.ffi.new('CAN_FIFOMailBox_TypeDef *')
+    to_send[0].RIR = addr << 21
+    to_send[0].RDTR = length
+    to_send[0].RDTR = bus << 4
+    return to_send
+
   def _speed_msg(self, speed):
     to_send = libpandasafety_py.ffi.new('CAN_FIFOMailBox_TypeDef *')
     to_send[0].RIR = 842 << 21
@@ -273,5 +280,16 @@ class TestGmSafety(unittest.TestCase):
       self.assertTrue(self.safety.safety_tx_hook(self._torque_msg(sign * (MAX_RT_DELTA + 1))))
 
 
+  def test_fwd_hook(self):
+    # nothing allowed
+    buss = range(0x0, 0x3)
+    msgs = range(0x1, 0x800)
+
+    for b in buss:
+      for m in msgs:
+        # assume len 8
+        self.assertEqual(-1, self.safety.safety_fwd_hook(b, self._send_msg(b, m, 8)))
+
+
 if __name__ == "__main__":
   unittest.main()

tests/safety/test_subaru.py

@@ -32,6 +32,13 @@ class TestSubaruSafety(unittest.TestCase):
     cls.safety.safety_set_mode(10, 0)
     cls.safety.init_tests_subaru()
 
+  def _send_msg(self, bus, addr, length):
+    to_send = libpandasafety_py.ffi.new('CAN_FIFOMailBox_TypeDef *')
+    to_send[0].RIR = addr << 21
+    to_send[0].RDTR = length
+    to_send[0].RDTR = bus << 4
+    return to_send
+
   def _set_prev_torque(self, t):
     self.safety.set_subaru_desired_torque_last(t)
     self.safety.set_subaru_rt_torque_last(t)
@@ -166,5 +173,22 @@ class TestSubaruSafety(unittest.TestCase):
       self.assertTrue(self.safety.safety_tx_hook(self._torque_msg(sign * (MAX_RT_DELTA + 1))))
 
 
+  def test_fwd_hook(self):
+    buss = range(0x0, 0x3)
+    msgs = range(0x1, 0x800)
+    blocked_msgs = [290, 356, 545, 802]
+    for b in buss:
+      for m in msgs:
+        if b == 0:
+          fwd_bus = 2
+        elif b == 1:
+          fwd_bus = -1
+        elif b == 2:
+          fwd_bus = -1 if m in blocked_msgs else 0
+
+        # assume len 8
+        self.assertEqual(fwd_bus, self.safety.safety_fwd_hook(b, self._send_msg(b, m, 8)))
+
+
 if __name__ == "__main__":
   unittest.main()