summaryrefslogtreecommitdiff
path: root/service/test/unit
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2016-01-27 13:56:41 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2016-01-27 13:57:26 +0100
commite66b356f900bc9899a5506378163ffaadd4a32b5 (patch)
tree1f7d06ac3c23a274f91c6e706afcc1615ded2397 /service/test/unit
parent32dce59ce1aa32846948148fafaffb190206477e (diff)
Add a login multi user functional test
- Issue #576 - Extended AppTestClient with multi user support
Diffstat (limited to 'service/test/unit')
-rw-r--r--service/test/unit/resources/test_login_resource.py4
-rw-r--r--service/test/unit/test_application.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py
index 1f9a7c6a..1ccc530d 100644
--- a/service/test/unit/resources/test_login_resource.py
+++ b/service/test/unit/resources/test_login_resource.py
@@ -88,6 +88,7 @@ class TestLoginPOST(unittest.TestCase):
config.leap_home = 'some_folder'
leap_session.config = config
leap_session.fresh_account = False
+ self.leap_session = leap_session
self.leap_user = LeapUser(leap_session)
@patch('twisted.web.util.redirectTo')
@@ -99,8 +100,7 @@ class TestLoginPOST(unittest.TestCase):
def assert_login_setup_service_for_user(_):
verify(self.portal).login(ANY(), None, IResource)
- self.assertTrue(mock_service_setup.called)
- verify(self.services_factory).add_session('some_user_uuid', ANY())
+ verify(self.services_factory).create_services_from(self.leap_session)
mock_redirect.assert_called_once_with('/', self.request)
self.assertTrue(self.resource.is_logged_in(self.request))
diff --git a/service/test/unit/test_application.py b/service/test/unit/test_application.py
index a0eb9986..5f7f9c74 100644
--- a/service/test/unit/test_application.py
+++ b/service/test/unit/test_application.py
@@ -38,7 +38,7 @@ class ApplicationTest(unittest.TestCase):
@patch('leap.common.events.client')
@patch('pixelated.application.reactor')
- @patch('pixelated.application.Services')
+ @patch('pixelated.application.services.Services')
def test_that_start_user_agent_binds_to_tcp_port_if_no_ssl_options(self, services_mock, reactor_mock, _):
# FIXME patch something closer, instead of leap.common
app_mock = MagicMock()
@@ -56,7 +56,7 @@ class ApplicationTest(unittest.TestCase):
@patch('leap.common.events.client')
@patch('pixelated.application.reactor')
- @patch('pixelated.application.Services')
+ @patch('pixelated.application.services.Services')
def test_that_start_user_agent_binds_to_ssl_if_ssl_options(self, services_mock, reactor_mock, _):
# FIXME patch something closer, instead of leap.common
app_mock = MagicMock()