summary refs log tree commit diff
path: root/tests/replication/test_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-21 13:11:19 +0000
committerErik Johnston <erik@matrix.org>2017-03-21 13:11:19 +0000
commitc042bcbe0fbafafd4553d56eddd12ec2dd9cb976 (patch)
treece0fa5f9c96666672f5f524185e53de9daed0d25 /tests/replication/test_resource.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2033 from matrix-org/erikj/repl_speed (diff)
downloadsynapse-c042bcbe0fbafafd4553d56eddd12ec2dd9cb976.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/replication/test_resource.py')
-rw-r--r--tests/replication/test_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py

index 93b9fad012..429b37e360 100644 --- a/tests/replication/test_resource.py +++ b/tests/replication/test_resource.py
@@ -68,7 +68,7 @@ class ReplicationResourceCase(unittest.TestCase): code, body = yield get self.assertEquals(code, 200) self.assertEquals(body["events"]["field_names"], [ - "position", "internal", "json", "state_group" + "position", "event_id", "room_id", "type", "state_key", ]) @defer.inlineCallbacks