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/test_distributor.py | |
| 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/test_distributor.py')
| -rw-r--r-- | tests/test_distributor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_distributor.py b/tests/test_distributor.py index 04933f0ecf..39c5b8dff2 100644 --- a/tests/test_distributor.py +++ b/tests/test_distributor.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from tests import unittest from twisted.internet import defer -from twisted.trial import unittest from mock import Mock, patch |