diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2016-10-18 20:08:39 -0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2016-10-18 20:08:39 -0200 |
| commit | 75b633a173f217ccd508cf6b5306a3e93f79c2e6 (patch) | |
| tree | e60df5221e5ab15264571bf52233c385a142b49a /service/test/unit/resources | |
| parent | 9356d5c3d4e940e5d4ebf1c851a16b43374a6bc3 (diff) | |
Adapted imports to reflect new bitmask-dev dependency
Diffstat (limited to 'service/test/unit/resources')
| -rw-r--r-- | service/test/unit/resources/test_keys_resources.py | 4 | ||||
| -rw-r--r-- | service/test/unit/resources/test_logout_resources.py | 4 | ||||
| -rw-r--r-- | service/test/unit/resources/test_user_settings_resource.py | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py index a7c885ca..17297206 100644 --- a/service/test/unit/resources/test_keys_resources.py +++ b/service/test/unit/resources/test_keys_resources.py @@ -1,8 +1,8 @@ import json import ast from mockito import mock, when, any as ANY -from leap.keymanager import KeyNotFound -from leap.keymanager.keys import OpenPGPKey +from leap.bitmask.keymanager import KeyNotFound +from leap.bitmask.keymanager.keys import OpenPGPKey from pixelated.application import UserAgentMode from pixelated.config.services import ServicesFactory diff --git a/service/test/unit/resources/test_logout_resources.py b/service/test/unit/resources/test_logout_resources.py index 845fcde9..33c8537f 100644 --- a/service/test/unit/resources/test_logout_resources.py +++ b/service/test/unit/resources/test_logout_resources.py @@ -1,5 +1,3 @@ -import logging - from mock import patch, MagicMock from twisted.internet import defer from twisted.trial import unittest @@ -9,8 +7,6 @@ from twisted.web.test.requesthelper import DummyRequest from pixelated.resources.logout_resource import LogoutResource from test.unit.resources import DummySite -logging.getLogger('pixelated.resources').addHandler(logging.NullHandler()) - class TestLogoutResource(unittest.TestCase): def setUp(self): diff --git a/service/test/unit/resources/test_user_settings_resource.py b/service/test/unit/resources/test_user_settings_resource.py index a33ad571..30a3c4cd 100644 --- a/service/test/unit/resources/test_user_settings_resource.py +++ b/service/test/unit/resources/test_user_settings_resource.py @@ -7,7 +7,7 @@ from pixelated.resources.user_settings_resource import UserSettingsResource, FIN from mockito import mock, when, any from test.unit.resources import DummySite from twisted.web.test.requesthelper import DummyRequest -from leap.keymanager.keys import OpenPGPKey +from leap.bitmask.keymanager.keys import OpenPGPKey from twisted.internet import defer from twisted.python.failure import Failure |