diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-15 14:15:10 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-15 14:15:10 +0100 |
| commit | b0406b9ead0e3b726ef2c675181d040ca392e85d (patch) | |
| tree | 42fdeee7d4b5eb283f6a406463499ae05b9e5ffe /tests/handlers/test_federation.py | |
| parent | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory (diff) | |
| parent | Correctly handle the 'age' key in events and pdus (diff) | |
| download | synapse-b0406b9ead0e3b726ef2c675181d040ca392e85d.tar.xz | |
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 6fc3d8f7fd..f0308a29d3 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -14,7 +14,7 @@ from twisted.internet import defer -from twisted.trial import unittest +from tests import unittest from synapse.api.events.room import ( InviteJoinEvent, MessageEvent, RoomMemberEvent @@ -26,12 +26,8 @@ from synapse.federation.units import Pdu from mock import NonCallableMock, ANY -import logging - from ..utils import get_mock_call_args -logging.getLogger().addHandler(logging.NullHandler()) - class FederationTestCase(unittest.TestCase): |