OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix case in `wait_for_background_updates` where `self.store` does not exist (#11331) 

Pull the DataStore from the HomeServer instance, which
always exists.
pull/11535/head
Andrew Morgan 2021-12-07 16:51:53 +00:00 committed by GitHub
parent 26b5d2320f
commit d6fb96e056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11331.misc Normal file
View File

@ -0,0 +1 @@
A test helper (`wait_for_background_updates`) no longer depends on classes defining a `store` property.

11
tests/unittest.py
View File

@ -331,16 +331,13 @@ class HomeserverTestCase(TestCase):
time.sleep(0.01) time.sleep(0.01)
def wait_for_background_updates(self) -> None: def wait_for_background_updates(self) -> None:
"""Block until all background database updates have completed. """Block until all background database updates have completed."""
store = self.hs.get_datastore()
Note that callers must ensure there's a store property created on the
testcase.
"""
while not self.get_success( while not self.get_success(
self.store.db_pool.updates.has_completed_background_updates() store.db_pool.updates.has_completed_background_updates()
): ):
self.get_success( self.get_success(
self.store.db_pool.updates.do_next_background_update(False), by=0.1 store.db_pool.updates.do_next_background_update(False), by=0.1
) )
def make_homeserver(self, reactor, clock): def make_homeserver(self, reactor, clock):