diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
| commit | faba873d4b91cf03c5c2d9546a6df781ce58f2cc (patch) | |
| tree | 9fca4c5ed30c77c43023d9b365a37ec90261f2b4 /tests/storage/test_redaction.py | |
| parent | Newsfile (diff) | |
| parent | Add docs for undoing room shutdowns (#7998) (diff) | |
| download | synapse-faba873d4b91cf03c5c2d9546a6df781ce58f2cc.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_limiting_to_joins
Diffstat (limited to 'tests/storage/test_redaction.py')
| -rw-r--r-- | tests/storage/test_redaction.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py index db3667dc43..0f0e1cd09b 100644 --- a/tests/storage/test_redaction.py +++ b/tests/storage/test_redaction.py @@ -237,7 +237,9 @@ class RedactionTestCase(unittest.HomeserverTestCase): @defer.inlineCallbacks def build(self, prev_event_ids): - built_event = yield self._base_builder.build(prev_event_ids) + built_event = yield defer.ensureDeferred( + self._base_builder.build(prev_event_ids) + ) built_event._event_id = self._event_id built_event._dict["event_id"] = self._event_id |