Fix native AOL test build and fixture typing

This commit is contained in:
Dom
2026-10-15 19:04:32 -05:00
parent 2d2a988633
commit c6140605da
4 changed files with 21 additions and 9 deletions
@@ -126,8 +126,8 @@ int main() {
intent.setOptionalSetRelease(true);
auto retained = [&](const std::string &producer = "card-session", bool optional = false,
uint64_t stamp = CARD_NS, uint64_t source = AXIS_SOURCE_NS, uint64_t clock = GAP_NOW) {
auto wire = capnp::messageToFlatArray(intent_builder);
return aol_armed_intent(wire.asBytes(), stamp, source, clock, optional, producer);
auto retained_flat = capnp::messageToFlatArray(intent_builder);
return aol_armed_intent(retained_flat.asBytes(), stamp, source, clock, optional, producer);
};
assert(retained());
assert(retained("card-session", false, CARD_NS, AXIS_SOURCE_NS, CARD_NS + 30000000ULL));
@@ -2,6 +2,7 @@
import math
import struct
from types import SimpleNamespace
from typing import TypedDict
import unittest
from capnp.lib.capnp import KjException, _DynamicStructReader
@@ -11,7 +12,21 @@ from openpilot.starpilot.flm.runtime_adapter_registry import SourceState
NOW = 10_000_000_000
CP = 'c' * 64
FIELDS = {'version': 1, 'enabled': True, 'manual': False, 'resetGeneration': 'reset-1', 'sourceEpoch': 'b' * 64,
class ReceiptFields(TypedDict):
version: int
enabled: bool
manual: bool
resetGeneration: str
sourceEpoch: str
observedMonoTime: int
validUntilMonoTime: int
cpSha256: str
calibrationBasis: list[float]
FIELDS: ReceiptFields = {'version': 1, 'enabled': True, 'manual': False, 'resetGeneration': 'reset-1', 'sourceEpoch': 'b' * 64,
'observedMonoTime': NOW, 'validUntilMonoTime': NOW + 500_000_000, 'cpSha256': CP,
'calibrationBasis': [0.0, 0.0, 0.0]}
VALID_LOG = [
@@ -35,7 +50,7 @@ def envelope(row, valid=True):
def expected(**changes):
row = {**FIELDS, **changes}
row: ReceiptFields = {**FIELDS, **changes}
return SourceState(row['enabled'], row['manual'], row['resetGeneration'], row['sourceEpoch'],
row['observedMonoTime'], row['validUntilMonoTime'], row['cpSha256'], tuple(row['calibrationBasis']))
@@ -97,7 +97,7 @@ def session_fixture(owner):
session._favorite_read_at = None
session._favorite_snapshot = session._favorite_data = None
session.favorites_owner = owner
session._favorite_authority = lambda: True
session._favorite_authority = Mock(return_value=True)
session.favorites = OnroadFavorites(NS(profile=Profile.LARGE), session._favorite_request)
state = NS(viewport_width=2160, camera_available=True, alert=NS(size=AlertSize.NONE),
appearance=NS(camera_view=CameraViewChoice.NONE))
+1 -4
View File
@@ -1,4 +1 @@
{
"schema_version": 1,
"protected_inventory_sha256": "def334baecc644f3e8e90376c38dc246c1285ee03161aa7eaf92f272399ab496"
}
{"protected_inventory_sha256": "61df7f15b13c2f911a49ade67d1cd5181114a36e04f1487d1a250d58d44aa545", "schema_version": 1}