From 2c9dced9a8cd1bf501079e4a49eb2165e9af00b9 Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Mon, 2 Nov 2026 00:36:43 -0600
Subject: [PATCH] Test Calibration Identity Changes

---
 .../locationd/test/test_calibrationd.py       | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/openpilot/selfdrive/locationd/test/test_calibrationd.py b/openpilot/selfdrive/locationd/test/test_calibrationd.py
index a4f64ac0ea..18e5aa3b38 100644
--- a/openpilot/selfdrive/locationd/test/test_calibrationd.py
+++ b/openpilot/selfdrive/locationd/test/test_calibrationd.py
@@ -124,3 +124,53 @@ class TestCalibrationd(OpenpilotTestCase):
     assert c.valid_blocks == 0
     assert c.cal_status == log.ExtrinsicsCalibration.Status.recalibrating
     np.testing.assert_allclose(c.rpy, [0.0, 0.0, MAX_ALLOWED_YAW_SPREAD*1.1], atol=1e-2)
+
+
+class TestCalibrationIdentity(OpenpilotTestCase):
+  def test_only_a_different_verified_real_car_resets_calibration(self):
+    from unittest.mock import patch
+    from opendbc.car.structs import car
+    from openpilot.selfdrive.locationd import calibrationd
+
+    class StartupCaptured(Exception):
+      pass
+
+    params = Params()
+    saved = messaging.new_message('extrinsicsCalibration')
+    saved.extrinsicsCalibration.validBlocks = 8
+    saved.extrinsicsCalibration.rpyCalib = [0., .01, .02]
+    saved.extrinsicsCalibration.height = [1.22]
+    real_calibrator = calibrationd.Calibrator
+    for previous, current, raw_previous, reset in (
+      (('hyundai', 'A'), ('hyundai', 'A'), False, False),
+      (('hyundai', 'A'), ('toyota', 'B'), False, True),
+      (('mock', 'MOCK'), ('toyota', 'B'), False, False),
+      (('toyota', 'B'), ('mock', 'MOCK'), False, False),
+      (None, ('toyota', 'B'), False, False),
+      (('hyundai', 'A'), ('toyota', 'B'), True, False),
+    ):
+      with self.subTest(previous=previous, current=current, raw_previous=raw_previous):
+        params.remove('CarParamsPrevRoute')
+        put_cache(params, 'CalibrationParams', saved, block=True)
+        cp = car.CarParams.new_message(brand=current[0], carFingerprint=current[1])
+        params.put('CarParams', cp.to_bytes(), block=True)
+        if previous is not None:
+          old = car.CarParams.new_message(brand=previous[0], carFingerprint=previous[1])
+          if raw_previous:
+            params.put('CarParamsPrevRoute', old.to_bytes(), block=True)
+          else:
+            put_cache(params, 'CarParamsPrevRoute', old, block=True)
+        captured = []
+
+        def capture(**kwargs):
+          captured.append(real_calibrator(**kwargs))
+          raise StartupCaptured
+
+        with patch.object(calibrationd, 'config_realtime_process'), \
+             patch.object(calibrationd.messaging, 'PubMaster'), \
+             patch.object(calibrationd.messaging, 'SubMaster'), \
+             patch.object(calibrationd, 'Calibrator', side_effect=capture):
+          with self.assertRaises(StartupCaptured):
+            calibrationd.main()
+        self.assertEqual(captured[0].valid_blocks, 0 if reset else 8)
+        self.assertEqual(params.get('CalibrationParams') is None, reset)