diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-22 18:54:00 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-22 18:54:00 +0100 |
| commit | 09d79b0a9bf7a194383830d2e55530c70f2366b6 (patch) | |
| tree | 76573bac3ca48deeca6cd33f91ed2ee3408dffb2 /tests/federation/test_pdu_codec.py | |
| parent | SYN-39: Add documentation explaining how to check a signature (diff) | |
| parent | Show display name changes in the message list. (diff) | |
| download | synapse-09d79b0a9bf7a194383830d2e55530c70f2366b6.tar.xz | |
Merge branch 'develop' into server2server_signing
Diffstat (limited to 'tests/federation/test_pdu_codec.py')
| -rw-r--r-- | tests/federation/test_pdu_codec.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |