Merge pull request #83 from novapost/update_tests

Roland Hedberg · Roland Hedberg · commit db91ff2137df · 2014-02-27T06:16:40.000-08:00
Update tests
diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
@@ -492,7 +492,7 @@ class MetaDataMD(MetaData):
     Handles locally stored metadata, the file format is the text representation
     of the Python representation of the metadata.
     """
-    def __init__(self, onts, attrc, filenamen, **kwargs):
+    def __init__(self, onts, attrc, filename, **kwargs):
         MetaData.__init__(self, onts, attrc, **kwargs)
         self.filename = filename
 
diff --git a/src/saml2/mongo_store.py b/src/saml2/mongo_store.py
@@ -153,7 +153,8 @@ def store(self, ident, name_id):
         self.mdb.store(ident, name_id=to_dict(name_id, ONTS.values(), True))
 
     def find_nameid(self, userid, nformat=None, sp_name_qualifier=None,
-                    name_qualifier=None, sp_provided_id=None):
+                    name_qualifier=None, sp_provided_id=None, **kwargs):
+        # reset passed for compatibility kwargs for next usage
         kwargs = {}
         if nformat:
             kwargs["name_format"] = nformat
diff --git a/tests/InCommon-metadata.xml b/tests/InCommon-metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="INC20140204T195141" Name="urn:mace:incommon" validUntil="2014-02-18T10:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<?xml version="1.0" encoding="UTF-8"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="INC20140204T195141" Name="urn:mace:incommon" validUntil="2020-02-18T10:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
@@ -125457,4 +125457,4 @@ SF+p+s3fUvjA71QwrE3AjKXRHVUkTOk3cr79cC3vKw==
     <EmailAddress>security@mghpcc.org</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
-</EntitiesDescriptor>
+</EntitiesDescriptor>
diff --git a/tests/metadata.aaitest.xml b/tests/metadata.aaitest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AAITest-20140205105921" Name="urn:mace:switch.ch:aaitest" validUntil="2014-02-10T09:59:21Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<?xml version="1.0" encoding="UTF-8"?><EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="AAITest-20140205105921" Name="urn:mace:switch.ch:aaitest" validUntil="2020-02-10T09:59:21Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
@@ -11793,4 +11793,4 @@ uO0GTCkBR4o9JvycnNPOWxknPccIms09elaAcgFDQ6o=
 			<OrganizationURL xml:lang="en">http://www.aai-demo-idp.switch.ch/</OrganizationURL>
 		</Organization>
 		</EntityDescriptor>
-</EntitiesDescriptor>
+</EntitiesDescriptor>
diff --git a/tests/swamid-2.0.xml b/tests/swamid-2.0.xml
diff --git a/tests/test_19_attribute_converter.py b/tests/test_19_attribute_converter.py
@@ -39,9 +39,11 @@ def test_ava_fro_1(self):
         for ac in self.acs:
             try:
                 ava = ac.fro(ats)
-                break
             except attribute_converter.UnknownNameFormat:
                 pass
+            # break if we have something
+            if ava:
+                break
         print ava.keys()
         assert _eq(ava.keys(), ['givenName', 'displayName', 'uid',
                                 'eduPersonNickname', 'street',
@@ -207,4 +209,4 @@ def test_noop_attribute_conversion():
     t = TestAC()
     t.setup_class()
     t.test_mixed_attributes_1()
-    #test_noop_attribute_conversion()
+    #test_noop_attribute_conversion()
diff --git a/tests/test_33_identifier.py b/tests/test_33_identifier.py
@@ -96,6 +96,7 @@ def test_transient_1(self):
         assert _eq(nameid.keyswv(), ['text', 'format', 'sp_name_qualifier',
                                      'name_qualifier'])
         assert nameid.format == NAMEID_FORMAT_TRANSIENT
+        assert nameid.text != "foobar"
         
     def test_vo_1(self):
         policy = Policy({
@@ -119,7 +120,8 @@ def test_vo_1(self):
                                      'name_qualifier'])
         assert nameid.sp_name_qualifier == 'http://vo.example.org/biomed'
         assert nameid.format == NAMEID_FORMAT_PERSISTENT
-        assert nameid.text != "foobar"
+        # we want to keep the user identifier in the nameid node
+        assert nameid.text == "foobar"
 
     def test_vo_2(self):
         policy = Policy({
diff --git a/tests/test_76_metadata_in_mdb.py b/tests/test_76_metadata_in_mdb.py
@@ -74,7 +74,7 @@ def test_metadata():
     assert len(certs) == 1
 
     sps = mds.with_descriptor("spsso")
-    assert len(sps) == 418
+    assert len(sps) == 417
 
     wants = mds.attribute_requirement('https://connect.sunet.se/shibboleth')
     assert wants["optional"] == []
diff --git a/tools/mdexport_test.py b/tools/mdexport_test.py
@@ -52,17 +52,21 @@
 }
 
 
-item = MDIMPORT[sys.argv[1]]
+def main():
+    item = MDIMPORT[sys.argv[1]]
 
-metad = None
+    metad = None
 
-if item["type"] == "local":
-    metad = MetaDataFile(sys.argv[1], ONTS.values(), item["file"])
-elif item["type"] == "external":
-    metad = MetaDataExtern(sys.argv[1], ONTS.values(),
-                           item["url"], "/opt/local/bin/xmlsec1", item["cert"])
+    if item["type"] == "local":
+        metad = MetaDataFile(sys.argv[1], ONTS.values(), item["file"])
+    elif item["type"] == "external":
+        metad = MetaDataExtern(sys.argv[1], ONTS.values(),
+                               item["url"], "/opt/local/bin/xmlsec1", item["cert"])
 
-if metad:
-    metad.load()
-    print metad.dumps()
+    if metad:
+        metad.load()
+        print metad.dumps()
 
+
+if __name__ == '__main__':
+    main()
