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/federation | |
| 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/federation')
| -rw-r--r-- | tests/federation/test_federation.py | 6 | ||||
| -rw-r--r-- | tests/federation/test_pdu_codec.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index 0b105fe723..954ccac2a4 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -14,11 +14,10 @@ # trial imports from twisted.internet import defer -from twisted.trial import unittest +from tests import unittest # python imports from mock import Mock -import logging from ..utils import MockHttpResource, MockClock @@ -28,9 +27,6 @@ from synapse.federation.units import Pdu from synapse.storage.pdu import PduTuple, PduEntry -logging.getLogger().addHandler(logging.NullHandler()) - - def make_pdu(prev_pdus=[], **kwargs): """Provide some default fields for making a PduTuple.""" pdu_fields = { diff --git a/tests/federation/test_pdu_codec.py b/tests/federation/test_pdu_codec.py index 9f74ba119f..344e1baf60 100644 --- a/tests/federation/test_pdu_codec.py +++ b/tests/federation/test_pdu_codec.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.trial import unittest +from tests import unittest from synapse.federation.pdu_codec import ( PduCodec, encode_event_id, decode_event_id |