Repair learner receipt test fixtures

openpilot/starpilot/flm/tests/test_drain_receipt_clock.py

@@ -24,7 +24,7 @@ def exercise(*, control_offset=10_000_000, callback_offset=20_000_000,
   adapter = mock.Mock(event_collection=False, raw_storage=False,
                       source_plant_protocol=None, original_feedback_archive=None)
   adapter.prepare_control.return_value = evidence
-  collector = mock.Mock(adapter=adapter)
+  collector = mock.Mock(adapter=adapter, controls={evidence.control_ns: evidence}, recent_controls={})
   receipt_clock = [NOW]
   source_reader = mock.Mock(return_value=source)
   fitter = mock.Mock()
@@ -32,7 +32,7 @@ def exercise(*, control_offset=10_000_000, callback_offset=20_000_000,
     starpilotLateralState=SimpleNamespace(learningEvidence=SimpleNamespace(version=1)))
   applied = SimpleNamespace(which=lambda: 'starpilotCarState',
     starpilotCarState=SimpleNamespace(appliedEvidence=SimpleNamespace(version=1)))
-  output_value = object()
+  output_value = SimpleNamespace(control_ns=evidence.control_ns)
 
   def drain(socket, callback, receive, sink, captured_now):
     assert captured_now == NOW  # Original outer loop snapshot really is older.

openpilot/starpilot/flm/tests/test_live_tracking_residual_daemon.py

@@ -59,14 +59,14 @@ def test_only_actual_binding_change_clears_current_history_quarantine():
   assert history.priors == ()
 
 
-def test_fresh_incoming_control_rechecks_native_instead_of_inheriting_expired_previous(monkeypatch):
+def test_fresh_incoming_control_rechecks_native_instead_of_inheriting_denied_previous(monkeypatch):
   from openpilot.starpilot.flm.steerlearnerd import _collect_source_control
   from openpilot.starpilot.flm import runtime_adapter_registry as registry
   from openpilot.starpilot.flm.native_health import current_native_health
   identity = '8'*64
   monkeypatch.setattr(registry, 'current_authority', lambda sm, cp, **kwargs: (True, object(), identity))
   now = 300_000_000
-  old = SimpleNamespace(native_required=True, native_allowed=True, native_identity=identity,
+  old = SimpleNamespace(native_required=True, native_allowed=False, native_identity=identity,
     native_observed_ns=1, control_ns=100_000_000, native_expires_ns=200_000_001)
   fresh = SimpleNamespace(native_required=True, native_allowed=True, native_identity=identity,
     native_observed_ns=200_000_000, control_ns=290_000_000, native_expires_ns=400_000_000)
@@ -76,7 +76,7 @@ def test_fresh_incoming_control_rechecks_native_instead_of_inheriting_expired_pr
   collector.control=lambda control, stamp: observed.append((control,stamp,collector._learning_current_native_allowed))
   _collect_source_control(collector,fresh,None,None,now)
   assert observed==[(fresh,now,True)]
-  # Reusing this same current grant cannot renew the old record's lease.
+  # A current grant cannot authorize a record denied at its original issuance.
   _collect_source_control(collector,old,None,None,now)
   assert observed[-1]==(old,now,False)
   fresh.native_identity='9'*64

prebuilt.json

@@ -1 +1 @@
-{"protected_inventory_sha256": "d21001cfa8a218b64503644eee2520371b8ba17b47fca8126c3e6d1405e65e5d", "schema_version": 1}
+{"protected_inventory_sha256": "3b7cf8d9825b2b10cb3097344954b4b332e57e3f3c9cf3a9ab839fbb23f40d26", "schema_version": 1}