diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-27 11:38:13 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-27 11:38:13 +0100 |
commit | a8774cf351c5d1af98ed80dd0da6fadc09af7da3 (patch) | |
tree | 82920cd159ff73e3fd61a6dc5b7100d7f95918af /tests/rest/test_presence.py | |
parent | Added support for GET /events/$eventid with auth checks. (diff) | |
parent | Final url modifications: renamed /presence_list to /presence/list to keep the... (diff) | |
download | synapse-a8774cf351c5d1af98ed80dd0da6fadc09af7da3.tar.xz |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'tests/rest/test_presence.py')
-rw-r--r-- | tests/rest/test_presence.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py index 970405d271..e249a0d48a 100644 --- a/tests/rest/test_presence.py +++ b/tests/rest/test_presence.py @@ -171,7 +171,7 @@ class PresenceListTestCase(unittest.TestCase): ) (code, response) = yield self.mock_resource.trigger("GET", - "/presence_list/%s" % (myid), None) + "/presence/list/%s" % (myid), None) self.assertEquals(200, code) self.assertEquals( @@ -192,7 +192,7 @@ class PresenceListTestCase(unittest.TestCase): ) (code, response) = yield self.mock_resource.trigger("POST", - "/presence_list/%s" % (myid), + "/presence/list/%s" % (myid), """{"invite": ["@banana:test"]}""" ) @@ -212,7 +212,7 @@ class PresenceListTestCase(unittest.TestCase): ) (code, response) = yield self.mock_resource.trigger("POST", - "/presence_list/%s" % (myid), + "/presence/list/%s" % (myid), """{"drop": ["@banana:test"]}""" ) |