diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
commit | 5e7883ec194f87eab4f577022e7bad8de4fb0203 (patch) | |
tree | 1deb9b8ee772c192f57ae20504c14feed08850e4 /tests/utils.py | |
parent | Do work in parellel when joining a room (diff) | |
parent | SYN-383: Extract the response list from 'server_keys' in the response JSON as... (diff) | |
download | synapse-5e7883ec194f87eab4f577022e7bad8de4fb0203.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index cc038fecf1..3b5c335911 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -197,6 +197,9 @@ class MockClock(object): return t + def looping_call(self, function, interval): + pass + def cancel_call_later(self, timer): if timer[2]: raise Exception("Cannot cancel an expired timer") @@ -355,7 +358,7 @@ class MemoryDataStore(object): return [] def get_room_events_max_id(self): - return 0 # TODO (erikj) + return "s0" # TODO (erikj) def get_send_event_level(self, room_id): return defer.succeed(0) |