Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

This commit is contained in:
Paul "LeoNerd" Evans 2014-09-12 18:24:53 +01:00
parent 958b52596c
commit cd62ee3f29
21 changed files with 52 additions and 61 deletions

View file

@ -14,12 +14,11 @@
# limitations under the License.
from twisted.trial import unittest
from tests import unittest
from twisted.internet import defer
from mock import Mock, call, ANY
import json
import logging
from ..utils import MockHttpResource, MockClock, DeferredMockCallable
@ -27,9 +26,6 @@ from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
logging.getLogger().addHandler(logging.NullHandler())
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,