Merge remote-tracking branch 'origin/develop' into test-sqlite-memory

1 files changed, 1 insertions, 5 deletions

diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py

index 63c9295944..f95ddd7018 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -14,11 +14,10 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from mock import Mock
-import logging
 
 from synapse.api.errors import AuthError
 from synapse.server import HomeServer
@@ -27,9 +26,6 @@ from synapse.handlers.profile import ProfileHandler
 from tests.utils import SQLiteMemoryDbPool
 
 
-logging.getLogger().addHandler(logging.NullHandler())
-
-
 class ProfileHandlers(object):
     def __init__(self, hs):
         self.profile_handler = ProfileHandler(hs)