diff options
author | NavaL <ayoyo@thoughtworks.com> | 2016-06-23 12:01:17 +0200 |
---|---|---|
committer | NavaL <ayoyo@thoughtworks.com> | 2016-06-23 12:01:17 +0200 |
commit | 3b678f8d23a116a231be04e6f4da2219bd636362 (patch) | |
tree | 074d7e14dacd56538cb3b14ac0ed2601e439791e /service/test | |
parent | de888b1d14df2981038b419e824b3df8908cd78d (diff) |
refactoring: moved Service factories to the service config file
Diffstat (limited to 'service/test')
-rw-r--r-- | service/test/support/integration/app_test_client.py | 2 | ||||
-rw-r--r-- | service/test/support/integration/multi_user_client.py | 3 | ||||
-rw-r--r-- | service/test/unit/resources/test_keys_resources.py | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 49f0552a..a66fc62b 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -39,7 +39,7 @@ from pixelated.adapter.services.feedback_service import FeedbackService from pixelated.application import ServicesFactory, UserAgentMode, SingleUserServicesFactory, set_up_protected_resources from pixelated.bitmask_libraries.config import LeapConfig from pixelated.bitmask_libraries.session import LeapSession -from pixelated.config.services import Services +from pixelated.config.services import Services, ServicesFactory, SingleUserServicesFactory from pixelated.config.site import PixelatedSite from pixelated.adapter.mailstore import LeapMailStore diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py index 5f24456b..656e0901 100644 --- a/service/test/support/integration/multi_user_client.py +++ b/service/test/support/integration/multi_user_client.py @@ -19,7 +19,8 @@ from twisted.internet import defer from leap.auth import SRPAuth -from pixelated.application import UserAgentMode, ServicesFactory, set_up_protected_resources +from pixelated.application import UserAgentMode, set_up_protected_resources +from pixelated.config.services import ServicesFactory from pixelated.bitmask_libraries.session import LeapSession, LeapSessionFactory import pixelated.config.services diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py index 4aae8713..91c286c9 100644 --- a/service/test/unit/resources/test_keys_resources.py +++ b/service/test/unit/resources/test_keys_resources.py @@ -4,7 +4,8 @@ from mockito import mock, when, any as ANY from leap.keymanager import KeyNotFound from leap.keymanager.keys import OpenPGPKey -from pixelated.application import ServicesFactory, UserAgentMode +from pixelated.application import UserAgentMode +from pixelated.config.services import ServicesFactory from pixelated.resources.keys_resource import KeysResource import twisted.trial.unittest as unittest from twisted.web.test.requesthelper import DummyRequest |