summary refs log tree commit diff
path: root/tests/rest/client
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-03-03 19:05:54 +0000
committerRichard van der Hoff <richard@matrix.org>2016-03-03 19:05:54 +0000
commita85179aff3bf2bc1b132e9918cd8222a61a8bcc2 (patch)
treeaac1ff9e5bdca7ddc0fdc9d2cae5a5dcf13e8733 /tests/rest/client
parentEmpty commit (diff)
parentMerge pull request #621 from matrix-org/daniel/ratelimiting (diff)
downloadsynapse-a85179aff3bf2bc1b132e9918cd8222a61a8bcc2.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/SYN-642
Diffstat (limited to 'tests/rest/client')
-rw-r--r--tests/rest/client/v1/test_profile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py
index 0785965de2..1d210f9bf8 100644
--- a/tests/rest/client/v1/test_profile.py
+++ b/tests/rest/client/v1/test_profile.py
@@ -86,7 +86,7 @@ class ProfileTestCase(unittest.TestCase):
 
         self.assertEquals(200, code)
         self.assertEquals(mocked_set.call_args[0][0].localpart, "1234ABCD")
-        self.assertEquals(mocked_set.call_args[0][1].localpart, "1234ABCD")
+        self.assertEquals(mocked_set.call_args[0][1].user.localpart, "1234ABCD")
         self.assertEquals(mocked_set.call_args[0][2], "Frank Jr.")
 
     @defer.inlineCallbacks
@@ -155,5 +155,5 @@ class ProfileTestCase(unittest.TestCase):
 
         self.assertEquals(200, code)
         self.assertEquals(mocked_set.call_args[0][0].localpart, "1234ABCD")
-        self.assertEquals(mocked_set.call_args[0][1].localpart, "1234ABCD")
+        self.assertEquals(mocked_set.call_args[0][1].user.localpart, "1234ABCD")
         self.assertEquals(mocked_set.call_args[0][2], "http://my.server/pic.gif")