summary refs log tree commit diff
path: root/tests/test_visibility.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-30 10:12:13 +0100
committerErik Johnston <erik@matrix.org>2019-07-30 10:12:13 +0100
commit65fe31786d6a8c008084161a9445367edbe38f51 (patch)
tree19bb742970e152ea2004bede0198a06034bd3865 /tests/test_visibility.py
parentMerge branch 'release-v1.2.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentMerge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state (diff)
downloadsynapse-65fe31786d6a8c008084161a9445367edbe38f51.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/test_visibility.py')
-rw-r--r--tests/test_visibility.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_visibility.py b/tests/test_visibility.py

index 118c3bd238..e0605dac2f 100644 --- a/tests/test_visibility.py +++ b/tests/test_visibility.py
@@ -139,7 +139,7 @@ class FilterEventsForServerTestCase(tests.unittest.TestCase): builder ) yield self.hs.get_datastore().persist_event(event, context) - defer.returnValue(event) + return event @defer.inlineCallbacks def inject_room_member(self, user_id, membership="join", extra_content={}): @@ -161,7 +161,7 @@ class FilterEventsForServerTestCase(tests.unittest.TestCase): ) yield self.hs.get_datastore().persist_event(event, context) - defer.returnValue(event) + return event @defer.inlineCallbacks def inject_message(self, user_id, content=None): @@ -182,7 +182,7 @@ class FilterEventsForServerTestCase(tests.unittest.TestCase): ) yield self.hs.get_datastore().persist_event(event, context) - defer.returnValue(event) + return event @defer.inlineCallbacks def test_large_room(self):