diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
| commit | 8e2d4c6da55d2a21492f8610d595046f07d9887e (patch) | |
| tree | 85ca2f67dd9552a3884d76d7d645adfb88e179e4 /tests/rest/test_presence.py | |
| parent | Create the correct events with the right configuration when creating a new room. (diff) | |
| parent | Merge branch 'release-v0.1.0' into develop (diff) | |
| download | synapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
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" |