diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-01 22:14:56 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-01 22:15:02 +0100 |
| commit | 270d3028343191374b7b958a36d761daf9422f01 (patch) | |
| tree | da0a19316300b3f519d9ca11bd24b224d02b63c7 | |
| parent | No need to test is_presence_visible in _start_polling_local because we know i... (diff) | |
| download | synapse-270d3028343191374b7b958a36d761daf9422f01.tar.xz | |
Reënable presence visibility permission checking now it's not used on redundant code paths
| -rw-r--r-- | synapse/handlers/presence.py | 4 | ||||
| -rw-r--r-- | tests/handlers/test_presence.py | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index ff04be1460..7372a10f9b 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -150,10 +150,6 @@ class PresenceHandler(BaseHandler): @defer.inlineCallbacks def is_presence_visible(self, observer_user, observed_user): - defer.returnValue(True) - # return - # FIXME (erikj): This code path absolutely kills the database. - assert(observed_user.is_mine) if observer_user == observed_user: diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 844c4e3fb7..2eea474391 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -196,8 +196,6 @@ class PresenceStateTestCase(unittest.TestCase): SynapseError ) - test_get_disallowed_state.skip = "Presence permissions are disabled" - @defer.inlineCallbacks def test_set_my_state(self): mocked_set = self.datastore.set_presence_state |