diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 09:46:33 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 09:46:33 +0100 |
| commit | bf6fa6dd3dbaf929e2a15c1100ac6650aed65944 (patch) | |
| tree | bedb2fad2cb22eb99189879adf04258a0076f46e /tests/handlers/test_presencelike.py | |
| parent | Updated spec and api docs to desired new format. (diff) | |
| parent | BF: presence and eventMap were not reset at logout. (diff) | |
| download | synapse-bf6fa6dd3dbaf929e2a15c1100ac6650aed65944.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes
Diffstat (limited to 'tests/handlers/test_presencelike.py')
| -rw-r--r-- | tests/handlers/test_presencelike.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index b35980d948..72c55b3667 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -16,11 +16,10 @@ """This file contains tests of the "presence-like" data that is shared between presence and profiles; namely, the displayname and avatar_url.""" -from twisted.trial import unittest +from tests import unittest from twisted.internet import defer from mock import Mock, call, ANY -import logging from ..utils import MockClock @@ -35,9 +34,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE ONLINE = PresenceState.ONLINE -logging.getLogger().addHandler(logging.NullHandler()) - - class MockReplication(object): def __init__(self): self.edu_handlers = {} |