mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-02 11:26:09 -04:00
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
This commit is contained in:
commit
b0406b9ead
44 changed files with 269 additions and 108 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue