From cd62ee3f29456d96d336f4c67cbd37a0a95f7b4a Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Fri, 12 Sep 2014 18:24:53 +0100
Subject: Have all unit tests import from our own subclass of trial's unittest
 TestCase; set up logging in ONE PLACE ONLY

---
 tests/test_state.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/test_state.py')

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
 
 
-- 
cgit 1.4.1