Merge branch 'develop' into markjh/member_cleanup

This commit is contained in:
Mark Haines 2016-05-17 10:13:16 +01:00
commit 425e6b4983
14 changed files with 64 additions and 37 deletions

View file

@ -78,7 +78,7 @@ class ReplicationResourceCase(unittest.TestCase):
@defer.inlineCallbacks
def test_presence(self):
get = self.get(presence="-1")
yield self.hs.get_handlers().presence_handler.set_state(
yield self.hs.get_presence_handler().set_state(
self.user, {"presence": "online"}
)
code, body = yield get