diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
| commit | 4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf (patch) | |
| tree | 37b368d6039d986d70f153fb69d6345d1019d64a /tests/rest/test_presence.py | |
| parent | fix a few pyflakes errors (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
Diffstat (limited to 'tests/rest/test_presence.py')
| -rw-r--r-- | tests/rest/test_presence.py | 2 |
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" |