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/util/test_lock.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/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 |