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/util/test_lock.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/util/test_lock.py')
| -rw-r--r-- | tests/util/test_lock.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/util/test_lock.py b/tests/util/test_lock.py index 5623d78423..6a1e521b1e 100644 --- a/tests/util/test_lock.py +++ b/tests/util/test_lock.py @@ -15,7 +15,7 @@ from twisted.internet import defer -from twisted.trial import unittest +from tests import unittest from synapse.util.lockutils import LockManager @@ -105,4 +105,4 @@ class LockManagerTestCase(unittest.TestCase): pass with (yield self.lock_manager.lock(key)): - pass \ No newline at end of file + pass |