From 56424eca5c2dd6b4a1f71b676bb702ab50e9b893 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Fri, 29 Aug 2014 19:12:22 +0100
Subject: [PATCH] Bugfix for rest presence test - datastore needs to implement
 profile methods

---
 tests/rest/test_presence.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index ab0d580c7..6631b7797 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -274,6 +274,15 @@ class PresenceEventStreamTestCase(unittest.TestCase):
                 lambda u: defer.succeed([]))
 
         self.mock_datastore = hs.get_datastore()
+
+        def get_profile_displayname(user_id):
+            return defer.succeed("Frank")
+        self.mock_datastore.get_profile_displayname = get_profile_displayname
+
+        def get_profile_avatar_url(user_id):
+            return defer.succeed(None)
+        self.mock_datastore.get_profile_avatar_url = get_profile_avatar_url
+
         self.presence = hs.get_handlers().presence_handler
 
         self.u_apple = hs.parse_userid("@apple:test")
@@ -316,6 +325,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
              "content": {
                  "user_id": "@banana:test",
                  "state": ONLINE,
+                 "displayname": "Frank",
                  "mtime_age": 0,
             }},
         ]}, response)