summary refs log tree commit diff
path: root/tests/rest/utils.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-15 14:15:10 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-15 14:15:10 +0100
commitb0406b9ead0e3b726ef2c675181d040ca392e85d (patch)
tree42fdeee7d4b5eb283f6a406463499ae05b9e5ffe /tests/rest/utils.py
parentMerge remote-tracking branch 'origin/develop' into test-sqlite-memory (diff)
parentCorrectly handle the 'age' key in events and pdus (diff)
downloadsynapse-b0406b9ead0e3b726ef2c675181d040ca392e85d.tar.xz
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Diffstat (limited to 'tests/rest/utils.py')
-rw-r--r--tests/rest/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/utils.py b/tests/rest/utils.py

index 77f5ecf0df..ce2e8fd98a 100644 --- a/tests/rest/utils.py +++ b/tests/rest/utils.py
@@ -17,7 +17,7 @@ from twisted.internet import defer # trial imports -from twisted.trial import unittest +from tests import unittest from synapse.api.constants import Membership