diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
commit | 8346e6e696e6f0052bc0f68ee825c2b08da2387d (patch) | |
tree | 11969ca353dc86c798e3fa6fc094d6b4530ffc25 /tests | |
parent | Prefill state caches (diff) | |
parent | Merge pull request #2178 from matrix-org/erikj/message_metrics (diff) | |
download | synapse-8346e6e696e6f0052bc0f68ee825c2b08da2387d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to 'tests')
-rw-r--r-- | tests/storage/event_injector.py | 4 | ||||
-rw-r--r-- | tests/storage/test_events.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/storage/event_injector.py b/tests/storage/event_injector.py index 38556da9a7..024ac15069 100644 --- a/tests/storage/event_injector.py +++ b/tests/storage/event_injector.py @@ -27,10 +27,10 @@ class EventInjector: self.event_builder_factory = hs.get_event_builder_factory() @defer.inlineCallbacks - def create_room(self, room): + def create_room(self, room, user): builder = self.event_builder_factory.new({ "type": EventTypes.Create, - "sender": "", + "sender": user.to_string(), "room_id": room.to_string(), "content": {}, }) diff --git a/tests/storage/test_events.py b/tests/storage/test_events.py index 3762b38e37..14443b53bc 100644 --- a/tests/storage/test_events.py +++ b/tests/storage/test_events.py @@ -50,7 +50,7 @@ class EventsStoreTestCase(unittest.TestCase): # Create something to report room = RoomID.from_string("!abc123:test") user = UserID.from_string("@raccoonlover:test") - yield self.event_injector.create_room(room) + yield self.event_injector.create_room(room, user) self.base_event = yield self._get_last_stream_token() |