diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-17 11:08:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-17 11:10:37 +0100 |
| commit | 816988baaa31210b36c49ad207eecf30d0223595 (patch) | |
| tree | 7f10b3a6a890d4bbb7d33a76d5f26e0acc2b7497 /tests/replication | |
| parent | Drop some unused indices (diff) | |
| parent | Merge pull request #1162 from larroy/master (diff) | |
| download | synapse-816988baaa31210b36c49ad207eecf30d0223595.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth
Diffstat (limited to 'tests/replication')
| -rw-r--r-- | tests/replication/slave/storage/_base.py | 3 | ||||
| -rw-r--r-- | tests/replication/test_resource.py | 3 |
2 files changed, 3 insertions, 3 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 diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py index b69832cc1b..f406934a62 100644 --- a/tests/replication/test_resource.py +++ b/tests/replication/test_resource.py @@ -120,7 +120,7 @@ class ReplicationResourceCase(unittest.TestCase): self.hs.clock.advance_time_msec(1) code, body = yield get self.assertEquals(code, 200) - self.assertEquals(body, {}) + self.assertEquals(body.get("rows", []), []) test_timeout.__name__ = "test_timeout_%s" % (stream) return test_timeout @@ -195,7 +195,6 @@ class ReplicationResourceCase(unittest.TestCase): self.assertIn("field_names", stream) field_names = stream["field_names"] self.assertIn("rows", stream) - self.assertTrue(stream["rows"]) for row in stream["rows"]: self.assertEquals( len(row), len(field_names), |