diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 18:24:53 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 18:46:13 +0100 |
| commit | cd62ee3f29456d96d336f4c67cbd37a0a95f7b4a (patch) | |
| tree | f888ebd96556ae0852093973cc11d1be6d6f9102 /tests/util | |
| parent | Update CHANGES.rst (diff) | |
| download | synapse-cd62ee3f29456d96d336f4c67cbd37a0a95f7b4a.tar.xz | |
Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY
Diffstat (limited to 'tests/util')
| -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 |