Merge lp:~ricardokirkner/configglue/update-django-openid-auth-schema into lp:configglue

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 102
Merged at revision: 101
Proposed branch: lp:~ricardokirkner/configglue/update-django-openid-auth-schema
Merge into: lp:configglue
Diff against target: 39 lines (+16/-1)
2 files modified
configglue/contrib/schema/django_openid_auth.py (+3/-1)
configglue/tests/test_contrib_schema.py (+13/-0)
To merge this branch: bzr merge lp:~ricardokirkner/configglue/update-django-openid-auth-schema
Reviewer Review Type Date Requested Status
Ricardo Kirkner Approve
Natalia Bidart Approve
Review via email: mp+162474@code.launchpad.net

Commit message

Updated django-openid-auth schema in contrib, to support new OPENID_LAUNCHPAD_TEAMS_REQUIRED setting.

Description of the change

Updated django-openid-auth schema in contrib, to support new OPENID_LAUNCHPAD_TEAMS_REQUIRED setting.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good! Thanks

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Thanks for the test.

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

Make tarmac happy

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configglue/contrib/schema/django_openid_auth.py'
2--- configglue/contrib/schema/django_openid_auth.py 2012-05-10 12:45:19 +0000
3+++ configglue/contrib/schema/django_openid_auth.py 2013-05-03 21:43:26 +0000
4@@ -11,7 +11,7 @@
5 class DjangoOpenIdAuthSchema(Schema):
6 """Configglue schema for django-openid-auth."""
7
8- __version__ = '0.4'
9+ __version__ = '0.5'
10
11 class openid(Section):
12 openid_use_as_admin_login = BoolOption(
13@@ -37,6 +37,8 @@
14 openid_launchpad_teams_mapping = DictOption()
15 openid_launchpad_staff_teams = ListOption(
16 item=StringOption())
17+ openid_launchpad_teams_required = ListOption(
18+ item=StringOption())
19 openid_disallow_inames = BoolOption(
20 default=False)
21 allowed_external_openid_redirect_domains = ListOption(
22
23=== added file 'configglue/tests/test_contrib_schema.py'
24--- configglue/tests/test_contrib_schema.py 1970-01-01 00:00:00 +0000
25+++ configglue/tests/test_contrib_schema.py 2013-05-03 21:43:26 +0000
26@@ -0,0 +1,13 @@
27+from unittest import TestCase
28+
29+from configglue.schema import ListOption, StringOption
30+from configglue.contrib.schema import DjangoOpenIdAuthSchema
31+
32+
33+class DjangoOpenIdAuthSchemaTestCase(TestCase):
34+
35+ def test_openid_launchpad_teams_required_option(self):
36+ schema = DjangoOpenIdAuthSchema()
37+ option = schema.openid.openid_launchpad_teams_required
38+ self.assertTrue(isinstance(option, ListOption))
39+ self.assertTrue(isinstance(option.item, StringOption))

Subscribers

People subscribed via source and target branches