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/handlers/test_presencelike.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/handlers/test_presencelike.py')
| -rw-r--r-- | tests/handlers/test_presencelike.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index bba5dd4e53..c25c6889be 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -135,6 +135,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): mocked_set.assert_called_with("apple", {"state": UNAVAILABLE, "status_msg": "Away"}) + test_set_my_state.skip = "Presence polling is disabled" @defer.inlineCallbacks def test_push_local(self): @@ -209,6 +210,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): "displayname": "I am an Apple", "avatar_url": "http://foo", }, statuscache.state) + test_push_local.skip = "Presence polling is disabled" + @defer.inlineCallbacks def test_push_remote(self): @@ -239,6 +242,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): ], }, ) + test_push_remote.skip = "Presence polling is disabled" @defer.inlineCallbacks def test_recv_remote(self): |