openstack/deb-python-pysaml2
Code Issues Proposed changes

Fixed present test on ident. Should be rewritten and extended.

Browse Source
This commit is contained in:
Roland Hedberg
2013-01-17 13:22:11 +01:00
parent ec48bd2369
commit 3624c769a4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saml2/ident.py
View File

@@ -133,7 +133,7 @@ class IdentDB(object):
else: else:
sp_name_qualifier = sp_name_qualifier sp_name_qualifier = sp_name_qualifier
if name_id_policy: if name_id_policy and name_id_policy.format:
nameid_format = name_id_policy.format nameid_format = name_id_policy.format
elif local_policy: elif local_policy:
nameid_format = local_policy.get_nameid_format(sp_name_qualifier) nameid_format = local_policy.get_nameid_format(sp_name_qualifier)

12
tests/test_33_identifier.py
View File

@@ -117,8 +117,8 @@ class TestIdentifier():
assert _eq(nameid.keyswv(), ['text', 'sp_name_qualifier', 'format', assert _eq(nameid.keyswv(), ['text', 'sp_name_qualifier', 'format',
'name_qualifier']) 'name_qualifier'])
assert nameid.sp_name_qualifier == 'http://vo.example.org/biomed' assert nameid.sp_name_qualifier == 'http://vo.example.org/biomed'
assert nameid.format == 'urn:oid:2.16.756.1.2.5.1.1.1-NameID' assert nameid.format == NAMEID_FORMAT_PERSISTENT
assert nameid.text == "foobar" assert nameid.text != "foobar"
def test_vo_2(self): def test_vo_2(self):
policy = Policy({ policy = Policy({
@@ -134,12 +134,12 @@ class TestIdentifier():
name_id_policy = samlp.name_id_policy_from_string(NAME_ID_POLICY_2) name_id_policy = samlp.name_id_policy_from_string(NAME_ID_POLICY_2)
nameid = self.id.construct_nameid("foobar", policy, nameid = self.id.construct_nameid("foobar", policy,
"urn:mace:example.com:sp:1", 'http://vo.example.org/design',
{"uid": "foobar01"},
name_id_policy) name_id_policy)
assert _eq(nameid.keyswv(), ['text', 'sp_name_qualifier', 'format']) assert _eq(nameid.keyswv(), ['text', 'sp_name_qualifier', 'format',
'name_qualifier'])
assert nameid.sp_name_qualifier == 'http://vo.example.org/design' assert nameid.sp_name_qualifier == 'http://vo.example.org/design'
assert nameid.format == NAMEID_FORMAT_PERSISTENT assert nameid.format == NAMEID_FORMAT_PERSISTENT
assert nameid.text == "foobar01" assert nameid.text != "foobar01"