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/handlers/test_directory.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/handlers/test_directory.py')
| -rw-r--r-- | tests/handlers/test_directory.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 72a2b1443a..54d6e51f97 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.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.server import HomeServer from synapse.http.client import HttpClient @@ -26,9 +25,6 @@ from synapse.handlers.directory import DirectoryHandler from synapse.storage.directory import RoomAliasMapping -logging.getLogger().addHandler(logging.NullHandler()) - - class DirectoryHandlers(object): def __init__(self, hs): self.directory_handler = DirectoryHandler(hs) |