diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
| commit | 704e7e9f44bb6ac4de03e47fd9276396d3c00af9 (patch) | |
| tree | 2b3f49347cb9615bdacf276a8b786243aa16d324 /tests/federation/test_pdu_codec.py | |
| parent | freenode verification (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 (diff) | |
| download | synapse-704e7e9f44bb6ac4de03e47fd9276396d3c00af9.tar.xz | |
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0
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 |