summaryrefslogtreecommitdiff
path: root/service/test/unit
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@riseup.net>2016-10-19 16:56:43 -0200
committerBruno Wagner <bwagner@riseup.net>2016-10-19 16:56:43 -0200
commit425d6a54e13be2cdcd18f1b21a4ff70ae5d43ff0 (patch)
tree6705d319deaaf9aee234e82c7e0f6815926f17ba /service/test/unit
parentf47533fed69c0ede45285a236bb85efa2938f134 (diff)
Adapted logging in the UA to use twisted.logger
Diffstat (limited to 'service/test/unit')
-rw-r--r--service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py3
-rw-r--r--service/test/unit/resources/test_attachments_resource.py4
-rw-r--r--service/test/unit/resources/test_tags_resource.py4
3 files changed, 0 insertions, 11 deletions
diff --git a/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py b/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py
index 2aaa969c..f0e1e8c9 100644
--- a/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py
+++ b/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py
@@ -20,9 +20,6 @@ from twisted.trial import unittest
from mockito import mock, when, verify, never
from pixelated.adapter.mailstore.maintenance import SoledadMaintenance
from leap.bitmask.keymanager.openpgp import OpenPGPKey
-import logging
-
-logging.getLogger('pixelated.adapter.mailstore.maintenance').addHandler(logging.NullHandler())
SOME_EMAIL_ADDRESS = 'foo@example.tld'
diff --git a/service/test/unit/resources/test_attachments_resource.py b/service/test/unit/resources/test_attachments_resource.py
index 0424c481..06ae765f 100644
--- a/service/test/unit/resources/test_attachments_resource.py
+++ b/service/test/unit/resources/test_attachments_resource.py
@@ -1,6 +1,5 @@
import json
import unittest
-import logging
from mock import patch, MagicMock
from mockito import mock, when, verify, any as ANY
@@ -11,9 +10,6 @@ from pixelated.application import UserAgentMode
from pixelated.resources.attachments_resource import AttachmentsResource
from test.unit.resources import DummySite
-logging.basicConfig(level=logging.CRITICAL)
-logging.getLogger('pixelated.resources.attachments_resource').addHandler(logging.NullHandler())
-
class AttachmentsResourceTest(unittest.TestCase):
diff --git a/service/test/unit/resources/test_tags_resource.py b/service/test/unit/resources/test_tags_resource.py
index 684e95f2..a05da7a7 100644
--- a/service/test/unit/resources/test_tags_resource.py
+++ b/service/test/unit/resources/test_tags_resource.py
@@ -1,13 +1,9 @@
-import logging
-
from mock import MagicMock
from twisted.trial import unittest
from twisted.web.test.requesthelper import DummyRequest
from pixelated.resources.tags_resource import TagsResource
from test.unit.resources import DummySite
-logging.getLogger('pixelated.resources').addHandler(logging.NullHandler())
-
class TestTagsResource(unittest.TestCase):
def setUp(self):