diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
| commit | 485bb64ddbcc372c5ed3d74190eda06f02cb3f82 (patch) | |
| tree | e89ec33366b907bea794e9140f962d2951b29ff9 /tests/rest/test_presence.py | |
| parent | Use new StreamToken in pagination config (diff) | |
| parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
| download | synapse-485bb64ddbcc372c5ed3d74190eda06f02cb3f82.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
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" |