From 3d5386181377cc25f799a67bffa4cebd42f06cbe Mon Sep 17 00:00:00 2001 From: mikecarper Date: Mon, 19 Oct 2026 14:27:04 -0700 Subject: [PATCH] Isolate channel admission test shim from contact frame fixture --- test/fixtures/companion_channel_storage/checks.h | 6 +++--- test/test_companion_channel_storage.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/fixtures/companion_channel_storage/checks.h b/test/fixtures/companion_channel_storage/checks.h index 0a924925b..9da6de8bc 100644 --- a/test/fixtures/companion_channel_storage/checks.h +++ b/test/fixtures/companion_channel_storage/checks.h @@ -56,10 +56,10 @@ static void initializeContacts(ChannelFixture& f) { f.host.channels.push_back(defaults); } -class MyMesh { +class ChannelAdmission { DataStore* _store; public: - explicit MyMesh(DataStore& store) : _store(&store) {} + explicit ChannelAdmission(DataStore& store) : _store(&store) {} bool canMutateContacts() const; }; #include "channel_admission_under_test.h" @@ -99,7 +99,7 @@ static void channel_faults_do_not_poison_contacts() { #if defined(NRF52_PLATFORM) fail_channel_metadata = false; #endif - MyMesh admission(f.store); + ChannelAdmission admission(f.store); uint8_t path[64]; if (fault == 8) { assert(f.store.hasIncompleteContactLoad() && !admission.canMutateContacts()); diff --git a/test/test_companion_channel_storage.py b/test/test_companion_channel_storage.py index a007cc683..66b46b60f 100644 --- a/test/test_companion_channel_storage.py +++ b/test/test_companion_channel_storage.py @@ -62,7 +62,8 @@ static void* allocateChannelSnapshot(size_t size) { implementation += method(store, "bool DataStore::formatFileSystem()") + "\n" (work / "store_under_test.h").write_text(implementation) (work / "channel_admission_under_test.h").write_text( - method(mesh, "bool MyMesh::canMutateContacts() const")) + method(mesh, "bool MyMesh::canMutateContacts() const").replace( + "MyMesh::canMutateContacts", "ChannelAdmission::canMutateContacts", 1)) fixture = (ROOT / ("test/fixtures/contact_cache/test_contact_cache.cpp" if is_cached else "test/fixtures/companion_uncached_storage/test.cpp"))