summary refs log tree commit diff
path: root/tests/replication/slave/storage/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-13 14:23:48 +0100
committerErik Johnston <erik@matrix.org>2016-10-14 10:22:43 +0100
commit6f7540ada44b26d6eced6788650a08df672d0610 (patch)
tree37fbc9d465a630ec2ac244d8860b35bbfcbd697d /tests/replication/slave/storage/_base.py
parentFix email push notifs being dropped (diff)
parentMerge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff)
downloadsynapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
Diffstat (limited to 'tests/replication/slave/storage/_base.py')
-rw-r--r--tests/replication/slave/storage/_base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/replication/slave/storage/_base.py b/tests/replication/slave/storage/_base.py

index 1f13cd0bc0..b82868054d 100644 --- a/tests/replication/slave/storage/_base.py +++ b/tests/replication/slave/storage/_base.py
@@ -42,7 +42,8 @@ class BaseSlavedStoreTestCase(unittest.TestCase): @defer.inlineCallbacks def replicate(self): streams = self.slaved_store.stream_positions() - result = yield self.replication.replicate(streams, 100) + writer = yield self.replication.replicate(streams, 100) + result = writer.finish() yield self.slaved_store.process_replication(result) @defer.inlineCallbacks