diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-04-03 13:17:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 13:17:30 +0100 |
| commit | fd4c975b5bffb4eacf7fa07a4d6391fa1d3376c4 (patch) | |
| tree | 758163e4bcdb4a6aa506c9e2ac303e8794a067a5 /tests/unittest.py | |
| parent | Remove some `run_in_background` calls in replication code (#7203) (diff) | |
| parent | Update docstring per review comments (diff) | |
| download | synapse-fd4c975b5bffb4eacf7fa07a4d6391fa1d3376c4.tar.xz | |
Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_time
Only run one background update at a time
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index d0406ca2fd..27af5228fe 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -40,6 +40,7 @@ from synapse.http.server import JsonResource from synapse.http.site import SynapseRequest, SynapseSite from synapse.logging.context import ( SENTINEL_CONTEXT, + LoggingContext, current_context, set_current_context, ) @@ -419,15 +420,17 @@ class HomeserverTestCase(TestCase): config_obj.parse_config_dict(config, "", "") kwargs["config"] = config_obj + async def run_bg_updates(): + with LoggingContext("run_bg_updates", request="run_bg_updates-1"): + while not await stor.db.updates.has_completed_background_updates(): + await stor.db.updates.do_next_background_update(1) + hs = setup_test_homeserver(self.addCleanup, *args, **kwargs) stor = hs.get_datastore() # Run the database background updates, when running against "master". if hs.__class__.__name__ == "TestHomeServer": - while not self.get_success( - stor.db.updates.has_completed_background_updates() - ): - self.get_success(stor.db.updates.do_next_background_update(1)) + self.get_success(run_bg_updates()) return hs |