Rivian safety: test accel actuation message w/ stock long (#1927)

stock longitudinal when stock long too

Author: sshane

opendbc/safety/tests/test_rivian.py

@@ -8,7 +8,7 @@
 from opendbc.car.rivian.values import RivianSafetyFlags
 
 
-class TestRivianSafetyBase(common.PandaCarSafetyTest, common.DriverTorqueSteeringSafetyTest):
+class TestRivianSafetyBase(common.PandaCarSafetyTest, common.DriverTorqueSteeringSafetyTest, common.LongitudinalAccelSafetyTest):
 
   TX_MSGS = [[0x120, 0], [0x321, 2]]
   STANDSTILL_THRESHOLD = 0
@@ -77,21 +77,21 @@ def test_wheel_touch(self):
 
 class TestRivianStockSafety(TestRivianSafetyBase):
 
+  LONGITUDINAL = False
+
   def setUp(self):
     self.packer = CANPackerPanda("rivian_primary_actuator")
     self.safety = libsafety_py.libsafety
     self.safety.set_safety_hooks(CarParams.SafetyModel.rivian, 0)
     self.safety.init_tests()
 
 
-class TestRivianLongitudinalSafety(TestRivianSafetyBase, common.LongitudinalAccelSafetyTest):
+class TestRivianLongitudinalSafety(TestRivianSafetyBase):
 
   TX_MSGS = [[0x120, 0], [0x321, 2], [0x160, 0]]
   RELAY_MALFUNCTION_ADDRS = {0: (0x120, 0x160)}
   FWD_BLACKLISTED_ADDRS = {0: [0x321], 2: [0x120, 0x160]}
 
-  LONGITUDINAL = True
-
   def setUp(self):
     self.packer = CANPackerPanda("rivian_primary_actuator")
     self.safety = libsafety_py.libsafety