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/storage | |
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/storage')
-rw-r--r-- | tests/storage/test_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py index 330311448d..3ad9a4b0c0 100644 --- a/tests/storage/test_base.py +++ b/tests/storage/test_base.py @@ -14,7 +14,7 @@ # limitations under the License. -from twisted.trial import unittest +from tests import unittest from twisted.internet import defer from mock import Mock, call |