summary refs log tree commit diff
path: root/tests/server_notices
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-24 17:00:37 +0100
committerErik Johnston <erik@matrix.org>2018-08-24 17:00:37 +0100
commit9db24769914f5c9a3081f549cbff92ef96042578 (patch)
tree5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /tests/server_notices
parentNewsfile (diff)
parentMerge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff)
downloadsynapse-9db24769914f5c9a3081f549cbff92ef96042578.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
Diffstat (limited to 'tests/server_notices')
-rw-r--r--tests/server_notices/test_resource_limits_server_notices.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/server_notices/test_resource_limits_server_notices.py b/tests/server_notices/test_resource_limits_server_notices.py
index 494a7bc91e..5cc7fff39b 100644
--- a/tests/server_notices/test_resource_limits_server_notices.py
+++ b/tests/server_notices/test_resource_limits_server_notices.py
@@ -55,6 +55,7 @@ class TestResourceLimitsServerNotices(unittest.TestCase):
             returnValue=""
         )
         self._rlsn._store.add_tag_to_room = Mock()
+        self._rlsn._store.get_tags_for_room = Mock(return_value={})
         self.hs.config.admin_contact = "mailto:user@test.com"
 
     @defer.inlineCallbacks