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/test_state.py | |
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/test_state.py')
-rw-r--r-- | tests/test_state.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test_state.py b/tests/test_state.py index 16af95b7bc..b1624f0b25 100644 --- a/tests/test_state.py +++ b/tests/test_state.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 twisted.python.log import PythonLoggingObserver from synapse.state import StateHandler @@ -26,7 +26,6 @@ from collections import namedtuple from mock import Mock -import logging import mock |