summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
commit4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch)
tree21928f0803225e707532b477f581c6f4f1885ac9 /tests/utils.py
parentAllow guests to register and call /events?room_id= (diff)
parentMerge pull request #339 from matrix-org/daniel/removesomelies (diff)
downloadsynapse-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.py2
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):