diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 17:51:46 -0700 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 17:51:46 -0700 |
| commit | 7f2e76bef9e216c4ed34c45d40e09126cb72c0df (patch) | |
| tree | c6ecb4eb2c3e10321b82d6948e1f107d772d4c71 /tests/storage | |
| parent | Merge commit '4876af06d' into anoa/dinsic_release_1_18_x (diff) | |
| parent | 1.18.0rc1 (diff) | |
| download | synapse-7f2e76bef9e216c4ed34c45d40e09126cb72c0df.tar.xz | |
Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_x
* commit 'f88c48f3b': 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) Put a cache on `/state_ids` (#7931)
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_room.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py index b1dceb2918..1d77b4a2d6 100644 --- a/tests/storage/test_room.py +++ b/tests/storage/test_room.py @@ -109,7 +109,9 @@ class RoomEventsStoreTestCase(unittest.TestCase): etype=EventTypes.Name, name=name, content={"name": name}, depth=1 ) - state = yield self.store.get_current_state(room_id=self.room.to_string()) + state = yield defer.ensureDeferred( + self.store.get_current_state(room_id=self.room.to_string()) + ) self.assertEquals(1, len(state)) self.assertObjectHasAttributes( @@ -125,7 +127,9 @@ class RoomEventsStoreTestCase(unittest.TestCase): etype=EventTypes.Topic, topic=topic, content={"topic": topic}, depth=1 ) - state = yield self.store.get_current_state(room_id=self.room.to_string()) + state = yield defer.ensureDeferred( + self.store.get_current_state(room_id=self.room.to_string()) + ) self.assertEquals(1, len(state)) self.assertObjectHasAttributes( |