diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
commit | 4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch) | |
tree | 21928f0803225e707532b477f581c6f4f1885ac9 /tests/utils.py | |
parent | Allow guests to register and call /events?room_id= (diff) | |
parent | Merge pull request #339 from matrix-org/daniel/removesomelies (diff) | |
download | synapse-4e62ffdb21c17817a56c1d864d1f8dc91131b8ef.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index 4da51291a4..ca2c33cf8e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -335,7 +335,7 @@ class MemoryDataStore(object): ] def get_room_events_stream(self, user_id=None, from_key=None, to_key=None, - room_id=None, limit=0, with_feedback=False): + limit=0, with_feedback=False): return ([], from_key) # TODO def get_joined_hosts_for_room(self, room_id): |