diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 18:24:53 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 18:46:13 +0100 |
| commit | cd62ee3f29456d96d336f4c67cbd37a0a95f7b4a (patch) | |
| tree | f888ebd96556ae0852093973cc11d1be6d6f9102 /tests/handlers/test_presence.py | |
| parent | Update CHANGES.rst (diff) | |
| download | synapse-cd62ee3f29456d96d336f4c67cbd37a0a95f7b4a.tar.xz | |
Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY
Diffstat (limited to 'tests/handlers/test_presence.py')
| -rw-r--r-- | tests/handlers/test_presence.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 9eb8b6909f..06f5f9c2ba 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -14,11 +14,10 @@ # limitations under the License. -from twisted.trial import unittest +from tests import unittest from twisted.internet import defer, reactor from mock import Mock, call, ANY -import logging import json from ..utils import MockHttpResource, MockClock, DeferredMockCallable @@ -34,9 +33,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE ONLINE = PresenceState.ONLINE -logging.getLogger().addHandler(logging.NullHandler()) - - def _expect_edu(destination, edu_type, content, origin="test"): return { "origin": origin, @@ -92,7 +88,6 @@ class PresenceStateTestCase(unittest.TestCase): # Mock the RoomMemberHandler room_member_handler = Mock(spec=[]) hs.handlers.room_member_handler = room_member_handler - logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler) # Some local users to test with self.u_apple = hs.parse_userid("@apple:test") |