diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
| commit | 1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch) | |
| tree | 92d4bb31a1372239e317f8672d6b80e59b709523 /tests/rest/test_presence.py | |
| parent | Oops. Removed my NetBeans private folders (diff) | |
| parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
| download | synapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz | |
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
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" |