summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-19 12:27:07 +0000
committerGitHub <noreply@github.com>2019-03-19 12:27:07 +0000
commit5cf00c9f6085b62860e3e10f35f21e4004c70cef (patch)
treec113c95b90be39a6f0823365be6ac8087f800805 /synapse/config/_base.py
parentMerge pull request #4888 from matrix-org/rav/fix_disabled_hs (diff)
parentFix RegistrationTestCase (diff)
downloadsynapse-5cf00c9f6085b62860e3e10f35f21e4004c70cef.tar.xz
Merge pull request #4889 from matrix-org/rav/test_real_config
Use a regular HomeServerConfig object for unit tests
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index 5613f38e4d..a219a83550 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -405,7 +405,10 @@ class Config(object): self.invoke_all("generate_files", config) return - self.invoke_all("read_config", config) + self.parse_config_dict(config) + + def parse_config_dict(self, config_dict): + self.invoke_all("read_config", config_dict) def find_config_files(search_paths):