diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-22 10:20:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-22 10:20:17 +0000 |
| commit | 3677548a82be347bcc69cfd4bfa4570581ee755f (patch) | |
| tree | 0db80c2a0fb17c5fb9b3b5bd87f4691f5ac8adc7 /tests/config | |
| parent | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff) | |
| download | synapse-3677548a82be347bcc69cfd4bfa4570581ee755f.tar.xz | |
Use yaml safe_load
Diffstat (limited to 'tests/config')
| -rw-r--r-- | tests/config/test_load.py | 2 | ||||
| -rw-r--r-- | tests/config/test_room_directory.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py index d5f1777093..6bfc1970ad 100644 --- a/tests/config/test_load.py +++ b/tests/config/test_load.py @@ -43,7 +43,7 @@ class ConfigLoadingTestCase(unittest.TestCase): self.generate_config() with open(self.file, "r") as f: - raw = yaml.load(f) + raw = yaml.safe_load(f) self.assertIn("macaroon_secret_key", raw) config = HomeServerConfig.load_config("", ["-c", self.file]) diff --git a/tests/config/test_room_directory.py b/tests/config/test_room_directory.py index 3dc2631523..47fffcfeb2 100644 --- a/tests/config/test_room_directory.py +++ b/tests/config/test_room_directory.py @@ -22,7 +22,7 @@ from tests import unittest class RoomDirectoryConfigTestCase(unittest.TestCase): def test_alias_creation_acl(self): - config = yaml.load(""" + config = yaml.safe_load(""" alias_creation_rules: - user_id: "*bob*" alias: "*" @@ -74,7 +74,7 @@ class RoomDirectoryConfigTestCase(unittest.TestCase): )) def test_room_publish_acl(self): - config = yaml.load(""" + config = yaml.safe_load(""" alias_creation_rules: [] room_list_publication_rules: |