summary refs log tree commit diff
path: root/tests/rest/test_profile.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 18:24:53 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 18:46:13 +0100
commitcd62ee3f29456d96d336f4c67cbd37a0a95f7b4a (patch)
treef888ebd96556ae0852093973cc11d1be6d6f9102 /tests/rest/test_profile.py
parentUpdate CHANGES.rst (diff)
downloadsynapse-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/rest/test_profile.py')
-rw-r--r--tests/rest/test_profile.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py
index f41810df1f..e6e51f6dd0 100644
--- a/tests/rest/test_profile.py
+++ b/tests/rest/test_profile.py
@@ -15,7 +15,7 @@
 
 """Tests REST events for /profile paths."""
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from mock import Mock
@@ -28,6 +28,7 @@ from synapse.server import HomeServer
 myid = "@1234ABCD:test"
 PATH_PREFIX = "/_matrix/client/api/v1"
 
+
 class ProfileTestCase(unittest.TestCase):
     """ Tests profile management. """