diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-04-24 14:07:47 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-04-24 14:07:47 +0100 |
| commit | 649e48a7991b79891412ca2c745fbbaa1301ba23 (patch) | |
| tree | 253690c648b7c9ec4f885ddfc342168c80d674f6 /tests/config/test_database.py | |
| parent | Merge branch 'release-v1.12.4' into matrix-org-hotfixes (diff) | |
| parent | Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertion (diff) | |
| download | synapse-649e48a7991b79891412ca2c745fbbaa1301ba23.tar.xz | |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/config/test_database.py')
| -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) |