diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
| commit | 3eb45eba0e387dacb67158efe323f19731799c79 (patch) | |
| tree | 79d942de91b8c9a940e787da9b4a329047139a80 /tests/rest/test_presence.py | |
| parent | Add store for server certificates and keys (diff) | |
| parent | Add config tree to synapse. Add support for reading config from a file (diff) | |
| download | synapse-3eb45eba0e387dacb67158efe323f19731799c79.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'tests/rest/test_presence.py')
| -rw-r--r-- | tests/rest/test_presence.py | 2 |
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" |