summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-28 10:50:39 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-28 16:00:14 +0100
commitc46c8061261c365934d378e52bf721cf400a3303 (patch)
tree4de05397fc9de51c5334b04acfa9f73bf8cb19fe /tests/rest
parentDo a smart update of the recents from the events stream rather than hammering... (diff)
downloadsynapse-c46c8061261c365934d378e52bf721cf400a3303.tar.xz
Re-enable presence, un-skip presence tests
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/test_presence.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index e15ee38741..7f7347dcf9 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -114,7 +114,6 @@ 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):
@@ -318,4 +317,3 @@ class PresenceEventStreamTestCase(unittest.TestCase):
                  "mtime_age": 0,
             }},
         ]}, response)
-    test_shortpoll.skip = "Presence polling is disabled"