diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-03-20 16:24:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 15:24:22 +0000 |
| commit | c165c1233b8ef244fadca97c7d465fdcf473d077 (patch) | |
| tree | b8093f0e41eebb849350a434b14fcdfe0b61d6c1 /tests/config | |
| parent | Remove concept of a non-limited stream. (#7011) (diff) | |
| download | synapse-c165c1233b8ef244fadca97c7d465fdcf473d077.tar.xz | |
Improve database configuration docs (#6988)
Attempts to clarify the sample config for databases, and add some stuff about tcp keepalives to `postgres.md`.
Diffstat (limited to 'tests/config')
| -rw-r--r-- | tests/config/test_database.py | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/tests/config/test_database.py b/tests/config/test_database.py index 151d3006ac..f675bde68e 100644 --- a/tests/config/test_database.py +++ b/tests/config/test_database.py @@ -21,9 +21,9 @@ from tests import unittest class DatabaseConfigTestCase(unittest.TestCase): - def test_database_configured_correctly_no_database_conf_param(self): + def test_database_configured_correctly(self): conf = yaml.safe_load( - DatabaseConfig().generate_config_section("/data_dir_path", None) + DatabaseConfig().generate_config_section(data_dir_path="/data_dir_path") ) expected_database_conf = { @@ -32,21 +32,3 @@ class DatabaseConfigTestCase(unittest.TestCase): } self.assertEqual(conf["database"], expected_database_conf) - - def test_database_configured_correctly_database_conf_param(self): - - database_conf = { - "name": "my super fast datastore", - "args": { - "user": "matrix", - "password": "synapse_database_password", - "host": "synapse_database_host", - "database": "matrix", - }, - } - - conf = yaml.safe_load( - DatabaseConfig().generate_config_section("/data_dir_path", database_conf) - ) - - self.assertEqual(conf["database"], database_conf) |