summary refs log tree commit diff
path: root/tests/replication/test_resource.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-10-14 15:10:38 +0100
committerDavid Baker <dave@matrix.org>2016-10-14 15:10:38 +0100
commitbcb1245a2d4746d539ef60b9ca40e7ad16056efa (patch)
treec5927411c6d329bbabbf3e41f8d98cda588b24ff /tests/replication/test_resource.py
parentMake password reset email field case insensitive (diff)
parentMerge pull request #1169 from matrix-org/erikj/fix_email_notifs (diff)
downloadsynapse-bcb1245a2d4746d539ef60b9ca40e7ad16056efa.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to 'tests/replication/test_resource.py')
-rw-r--r--tests/replication/test_resource.py3
1 files changed, 1 insertions, 2 deletions
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),