diff options
author | Doug Fish <drfish@us.ibm.com> | 2015-05-06 05:42:22 -0500 |
---|---|---|
committer | Lin Hua Cheng <os.lcheng@gmail.com> | 2015-07-07 17:38:36 +0000 |
commit | 124a35baea01ea9c81a268d0c3bd09932b4e00cd (patch) | |
tree | 8135bd1347349d69b9680924a5597eb3aca38a9b | |
parent | 5267ef7890f5adeaf3095afa6ff411092db38900 (diff) | |
download | django_openstack_auth-124a35baea01ea9c81a268d0c3bd09932b4e00cd.tar.gz |
Add missing _ import to plugin/base.py
Change-Id: I790246d8c5c8702a6d8b5a3abb07cd46297e051a
Closes-Bug: 1452232
(cherry picked from commit 8aa02932c3efff3a2f17db474d0f024dbfc38bda)
-rw-r--r-- | openstack_auth/plugin/base.py | 1 | ||||
-rw-r--r-- | openstack_auth/tests/tests.py | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/openstack_auth/plugin/base.py b/openstack_auth/plugin/base.py index a2fc755..e3bd802 100644 --- a/openstack_auth/plugin/base.py +++ b/openstack_auth/plugin/base.py @@ -12,6 +12,7 @@ import abc +from django.utils.translation import ugettext_lazy as _ from keystoneclient import exceptions as keystone_exceptions from keystoneclient.v2_0 import client as v2_client from keystoneclient.v3 import client as v3_client diff --git a/openstack_auth/tests/tests.py b/openstack_auth/tests/tests.py index 29bfa3d..09bdc76 100644 --- a/openstack_auth/tests/tests.py +++ b/openstack_auth/tests/tests.py @@ -474,6 +474,15 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, test.TestCase): client.projects = self.mox.CreateMockAnything() client.projects.list(user=user.id).AndReturn(projects) + def _mock_unscoped_client_list_projects_fail(self, user): + client = self._mock_unscoped_client(user) + self._mock_unscoped_list_projects_fail(client, user) + + def _mock_unscoped_list_projects_fail(self, client, user): + client.projects = self.mox.CreateMockAnything() + client.projects.list(user=user.id).AndRaise( + keystone_exceptions.AuthorizationFailure) + def _create_password_auth(self, username=None, password=None, url=None): if not username: username = self.data.user.name @@ -607,6 +616,25 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin, test.TestCase): self.assertContains(response, 'You are not authorized for any projects.') + def test_fail_projects(self): + user = self.data.user + + form_data = self.get_form_data(user) + self._mock_unscoped_client_list_projects_fail(user) + self.mox.ReplayAll() + + url = reverse('login') + + # GET the page to set the test cookie. + response = self.client.get(url, form_data) + self.assertEqual(response.status_code, 200) + + # POST to the page to log in. + response = self.client.post(url, form_data) + self.assertTemplateUsed(response, 'auth/login.html') + self.assertContains(response, + 'Unable to retrieve authorized projects.') + def test_invalid_credentials(self): user = self.data.user |