Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes

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