From 3f2e5730f35c452ba2c9e825aca6ad3369c8d95f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 22 Jan 2025 14:05:04 +0000 Subject: [PATCH] Fix tests --- tests/handlers/test_federation_event.py | 5 +++-- tests/storage/test_event_chain.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/handlers/test_federation_event.py b/tests/handlers/test_federation_event.py index 5db10fa74c..213620caae 100644 --- a/tests/handlers/test_federation_event.py +++ b/tests/handlers/test_federation_event.py @@ -807,6 +807,7 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase): OTHER_USER = f"@user:{self.OTHER_SERVER_NAME}" main_store = self.hs.get_datastores().main + epoch_store = self.hs.get_datastores().state_epochs # Create the room. kermit_user_id = self.register_user("kermit", "test") @@ -958,7 +959,7 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase): bert_member_event.event_id: bert_member_event, rejected_kick_event.event_id: rejected_kick_event, }, - state_res_store=StateResolutionStore(main_store), + state_res_store=StateResolutionStore(main_store, epoch_store), ) ), [bert_member_event.event_id, rejected_kick_event.event_id], @@ -1003,7 +1004,7 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase): rejected_power_levels_event.event_id, ], event_map={}, - state_res_store=StateResolutionStore(main_store), + state_res_store=StateResolutionStore(main_store, epoch_store), full_conflicted_set=set(), ) ), diff --git a/tests/storage/test_event_chain.py b/tests/storage/test_event_chain.py index c4e216c308..f1a1ce4cc1 100644 --- a/tests/storage/test_event_chain.py +++ b/tests/storage/test_event_chain.py @@ -441,7 +441,7 @@ class EventChainStoreTestCase(HomeserverTestCase): persist_events_store._store_event_txn( txn, [ - (e, EventContext(self.hs.get_storage_controllers(), {})) + (e, EventContext(self.hs.get_storage_controllers(), 1, {})) for e in events ], )