summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-22 18:40:31 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-22 18:40:31 +0100
commit104808107ac6857e3d7bafefaa21f9ea90d9bad3 (patch)
tree50e0471bff78935969aec1854ed5005cd0ba0c18 /tests/rest
parentOops, we need to use defer.returnValue. (diff)
downloadsynapse-104808107ac6857e3d7bafefaa21f9ea90d9bad3.tar.xz
skip presence tests which broke when presence polling was disabled
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/test_presence.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index 8ac246b4d5..970405d271 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -114,6 +114,7 @@ class PresenceStateTestCase(unittest.TestCase):
         self.assertEquals(200, code)
         mocked_set.assert_called_with("apple",
                 {"state": UNAVAILABLE, "status_msg": "Away"})
+    test_set_my_status.skip = "Presence polling is disabled"
 
 
 class PresenceListTestCase(unittest.TestCase):
@@ -309,3 +310,4 @@ class PresenceEventStreamTestCase(unittest.TestCase):
                  "mtime_age": 0,
             }},
         ]}, response)
+    test_shortpoll.skip = "Presence polling is disabled"