summary refs log tree commit diff
path: root/tests/replication/_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:20 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:20 +0100
commit118e789e0c097e147428ac456b60be3281c5264e (patch)
tree3464c466ce6e4e909a75b71b382561e5e1792b93 /tests/replication/_base.py
parentMerge branch 'matrix-org-hotfixes' of github.com:matrix-org/synapse into matr... (diff)
parentUpdate changelog for v1.32.0 (diff)
downloadsynapse-118e789e0c097e147428ac456b60be3281c5264e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/replication/_base.py')
-rw-r--r--tests/replication/_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/replication/_base.py b/tests/replication/_base.py

index 1d4a592862..aff19d9fb3 100644 --- a/tests/replication/_base.py +++ b/tests/replication/_base.py
@@ -266,7 +266,7 @@ class BaseMultiWorkerStreamTestCase(unittest.HomeserverTestCase): return resource def make_worker_hs( - self, worker_app: str, extra_config: dict = {}, **kwargs + self, worker_app: str, extra_config: Optional[dict] = None, **kwargs ) -> HomeServer: """Make a new worker HS instance, correctly connecting replcation stream to the master HS. @@ -283,7 +283,7 @@ class BaseMultiWorkerStreamTestCase(unittest.HomeserverTestCase): config = self._get_worker_hs_config() config["worker_app"] = worker_app - config.update(extra_config) + config.update(extra_config or {}) worker_hs = self.setup_test_homeserver( homeserver_to_use=GenericWorkerServer,