summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-03 16:45:53 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-03 16:45:53 +0000
commit6797fcd9aba8cb9d4f2bf36a5b26846cca684b31 (patch)
tree919e47f9b059936785ce21a04001ef1454b5faef /tests
parentMerge pull request #338 from matrix-org/daniel/fixdb (diff)
parentThat TODO was done (diff)
downloadsynapse-6797fcd9aba8cb9d4f2bf36a5b26846cca684b31.tar.xz
Merge pull request #335 from matrix-org/markjh/room_tags
Add APIs for adding and removing tags from rooms
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v1/test_presence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py

index 29d9bbaad4..0e3b922246 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py
@@ -369,7 +369,7 @@ class PresenceEventStreamTestCase(unittest.TestCase): # all be ours # I'll already get my own presence state change - self.assertEquals({"start": "0_1_0_0", "end": "0_1_0_0", "chunk": []}, + self.assertEquals({"start": "0_1_0_0_0", "end": "0_1_0_0_0", "chunk": []}, response ) @@ -388,7 +388,7 @@ class PresenceEventStreamTestCase(unittest.TestCase): "/events?from=s0_1_0&timeout=0", None) self.assertEquals(200, code) - self.assertEquals({"start": "s0_1_0_0", "end": "s0_2_0_0", "chunk": [ + self.assertEquals({"start": "s0_1_0_0_0", "end": "s0_2_0_0_0", "chunk": [ {"type": "m.presence", "content": { "user_id": "@banana:test",