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_federation.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_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): |