From 104808107ac6857e3d7bafefaa21f9ea90d9bad3 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 22 Aug 2014 18:40:31 +0100
Subject: skip presence tests which broke when presence polling was disabled

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

(limited to 'tests/rest/test_presence.py')

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"
-- 
cgit 1.4.1