diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:21 +0100 |
| commit | e5481b22aac800b016e05f50a50ced85a226b364 (patch) | |
| tree | 4fa4dfed6d4154e61a71205fdfd098d1aae989f6 /tests | |
| parent | Use match rather than search (diff) | |
| download | synapse-e5481b22aac800b016e05f50a50ced85a226b364.tar.xz | |
Use allow/deny
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config/test_room_directory.py | 8 | ||||
| -rw-r--r-- | tests/handlers/test_directory.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/config/test_room_directory.py b/tests/config/test_room_directory.py index 75021a5f04..f37a17d618 100644 --- a/tests/config/test_room_directory.py +++ b/tests/config/test_room_directory.py @@ -26,16 +26,16 @@ class RoomDirectoryConfigTestCase(unittest.TestCase): alias_creation_rules: - user_id: "*bob*" alias: "*" - action: "denied" + action: "deny" - user_id: "*" alias: "#unofficial_*" - action: "allowed" + action: "allow" - user_id: "@foo*:example.com" alias: "*" - action: "allowed" + action: "allow" - user_id: "@gah:example.com" alias: "#goo:example.com" - action: "allowed" + action: "allow" """) rd_config = RoomDirectoryConfig() diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 4f299b74ba..8ae6556c0a 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -118,7 +118,7 @@ class TestCreateAliasACL(unittest.HomeserverTestCase): { "user_id": "*", "alias": "#unofficial_*", - "action": "allowed", + "action": "allow", } ] |