summary refs log tree commit diff
path: root/tests/handlers/test_directory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-15 22:39:13 +0000
committerErik Johnston <erik@matrix.org>2019-02-15 22:39:13 +0000
commit88af0317a2377d3cfda582bc9ee97a5a793c83f2 (patch)
tree38cef24478845b743793d58e1a438f8cbb1c46a0 /tests/handlers/test_directory.py
parentEmergency changes (diff)
parentMerge pull request #4647 from matrix-org/erikj/add_room_publishing_rules (diff)
downloadsynapse-88af0317a2377d3cfda582bc9ee97a5a793c83f2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/handlers/test_directory.py')
-rw-r--r--tests/handlers/test_directory.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py

index 8ae6556c0a..9bf395e923 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py
@@ -121,6 +121,7 @@ class TestCreateAliasACL(unittest.HomeserverTestCase): "action": "allow", } ] + config["room_list_publication_rules"] = [] rd_config = RoomDirectoryConfig() rd_config.read_config(config)