diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
| commit | d9d48aad2d58deb5db422a5373a4dac9334a0618 (patch) | |
| tree | 63e51372ca9ace4971403928bd46440ff9e455e2 /tests/storage/test_stream.py | |
| parent | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... (diff) | |
| parent | typo (diff) | |
| download | synapse-d9d48aad2d58deb5db422a5373a4dac9334a0618.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'tests/storage/test_stream.py')
| -rw-r--r-- | tests/storage/test_stream.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py index 708208aff1..da322152c7 100644 --- a/tests/storage/test_stream.py +++ b/tests/storage/test_stream.py @@ -156,13 +156,13 @@ class StreamStoreTestCase(unittest.TestCase): self.room1, self.u_bob, Membership.JOIN ) - event1 = yield self.event_injector.inject_room_member( + yield self.event_injector.inject_room_member( self.room1, self.u_alice, Membership.JOIN ) start = yield self.store.get_room_events_max_id() - event2 = yield self.event_injector.inject_room_member( + yield self.event_injector.inject_room_member( self.room1, self.u_alice, Membership.JOIN, ) |