summary refs log tree commit diff
path: root/tests/rest/client/v1/test_presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-05 16:40:06 +0000
committerGitHub <noreply@github.com>2019-12-05 16:40:06 +0000
commitaf5d0ebc7243c372c5fa238c421fbd6b9663ff29 (patch)
tree819cda313cb340ac08ce4a0a5dab8ed1d0b97948 /tests/rest/client/v1/test_presence.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentNewsfile (diff)
downloadsynapse-af5d0ebc7243c372c5fa238c421fbd6b9663ff29.tar.xz
Merge pull request #6482 from matrix-org/erikj/port_rest_v1
Port rest/v1 to async/await
Diffstat (limited to 'tests/rest/client/v1/test_presence.py')
-rw-r--r--tests/rest/client/v1/test_presence.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py
index 66c2b68707..0fdff79aa7 100644
--- a/tests/rest/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -15,6 +15,8 @@
 
 from mock import Mock
 
+from twisted.internet import defer
+
 from synapse.rest.client.v1 import presence
 from synapse.types import UserID
 
@@ -36,6 +38,7 @@ class PresenceTestCase(unittest.HomeserverTestCase):
         )
 
         hs.presence_handler = Mock()
+        hs.presence_handler.set_state.return_value = defer.succeed(None)
 
         return hs