summary refs log tree commit diff
path: root/tests/handlers/test_profile.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-19 17:52:58 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-19 17:52:58 +0000
commit420ccfc925bbdc4344e3f870b61dba2dd5069f6b (patch)
treea705309ba66e2e60e3796c276bd2e2f3867e1956 /tests/handlers/test_profile.py
parentMerge branch 'release-v0.6.0' (diff)
parentMock ratelimiter to make tests pass. (diff)
downloadsynapse-420ccfc925bbdc4344e3f870b61dba2dd5069f6b.tar.xz
Merge branch 'hotfixes-v0.6.0' v0.6.0a
Diffstat (limited to 'tests/handlers/test_profile.py')
-rw-r--r--tests/handlers/test_profile.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 1660e7e928..25b172aa5e 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -17,7 +17,7 @@
 from tests import unittest
 from twisted.internet import defer
 
-from mock import Mock
+from mock import Mock, NonCallableMock
 
 from synapse.api.errors import AuthError
 from synapse.server import HomeServer
@@ -59,7 +59,14 @@ class ProfileTestCase(unittest.TestCase):
                 resource_for_federation=Mock(),
                 replication_layer=self.mock_federation,
                 config=self.mock_config,
+                ratelimiter=NonCallableMock(spec_set=[
+                    "send_message",
+                ])
             )
+
+        self.ratelimiter = hs.get_ratelimiter()
+        self.ratelimiter.send_message.return_value = (True, 0)
+
         hs.handlers = ProfileHandlers(hs)
 
         self.store = hs.get_datastore()