summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 17:10:28 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 17:10:28 +0000
commit021d93db1104e8f26c48e296fa9c19e978bbef71 (patch)
tree9ad82760c2e72cc52045f4b4554a4cb7d89b8204 /tests
parentMerge pull request #66 from matrix-org/use-simplejson (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
downloadsynapse-021d93db1104e8f26c48e296fa9c19e978bbef71.tar.xz
Merge pull request #62 from matrix-org/state-chache
State chache
Diffstat (limited to 'tests')
-rw-r--r--tests/test_state.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_state.py b/tests/test_state.py
index 019e794aa2..fea25f7021 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -21,6 +21,8 @@ from synapse.api.auth import Auth
 from synapse.api.constants import EventTypes, Membership
 from synapse.state import StateHandler
 
+from .utils import MockClock
+
 from mock import Mock
 
 
@@ -138,10 +140,13 @@ class StateTestCase(unittest.TestCase):
                 "add_event_hashes",
             ]
         )
-        hs = Mock(spec=["get_datastore", "get_auth", "get_state_handler"])
+        hs = Mock(spec=[
+            "get_datastore", "get_auth", "get_state_handler", "get_clock",
+        ])
         hs.get_datastore.return_value = self.store
         hs.get_state_handler.return_value = None
         hs.get_auth.return_value = Auth(hs)
+        hs.get_clock.return_value = MockClock()
 
         self.state = StateHandler(hs)
         self.event_id = 0