diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
commit | 704e7e9f44bb6ac4de03e47fd9276396d3c00af9 (patch) | |
tree | 2b3f49347cb9615bdacf276a8b786243aa16d324 /tests/rest/test_events.py | |
parent | freenode verification (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 (diff) | |
download | synapse-704e7e9f44bb6ac4de03e47fd9276396d3c00af9.tar.xz |
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0
Diffstat (limited to 'tests/rest/test_events.py')
-rw-r--r-- | tests/rest/test_events.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py index fd2224f55f..79b371c04d 100644 --- a/tests/rest/test_events.py +++ b/tests/rest/test_events.py @@ -14,7 +14,7 @@ # limitations under the License. """ Tests REST events for /events paths.""" -from twisted.trial import unittest +from tests import unittest # twisted imports from twisted.internet import defer @@ -27,14 +27,12 @@ from synapse.server import HomeServer # python imports import json -import logging from ..utils import MockHttpResource, MemoryDataStore from .utils import RestTestCase from mock import Mock, NonCallableMock -logging.getLogger().addHandler(logging.NullHandler()) PATH_PREFIX = "/_matrix/client/api/v1" |