Merge branch 'master' into less_xmlsec_paths

Conflicts:
	src/saml2/config.py
	src/saml2/httpbase.py
	tests/test_30_mdstore.py
	tests/test_31_config.py

1 files changed, 16 insertions, 10 deletions

diff --git a/tests/test_30_mdstore.py b/tests/test_30_mdstore.py
index 55324928..78ea7e9c 100644
--- a/tests/test_30_mdstore.py
+++ b/tests/test_30_mdstore.py
@@ -26,8 +26,10 @@ from saml2.s_utils import UnknownPrincipal
 import xmldsig
 import xmlenc
 
+from pathutils import full_path
+
 sec_config = config.Config()
-sec_config.xmlsec_binary = sigver.get_xmlsec_binary(["/opt/local/bin"])
+#sec_config.xmlsec_binary = sigver.get_xmlsec_binary(["/opt/local/bin"])
 
 ONTS = {
     saml.NAMESPACE: saml,
@@ -41,32 +43,33 @@ ONTS = {
     xmlenc.NAMESPACE: xmlenc
 }
 
-ATTRCONV = ac_factory("attributemaps")
+ATTRCONV = ac_factory(full_path("attributemaps"))
 
 METADATACONF = {
     "1": {
-        "local": ["swamid-1.0.xml"]
+        "local": [full_path("swamid-1.0.xml")]
     },
     "2": {
-        "local": ["InCommon-metadata.xml"]
+        "local": [full_path("InCommon-metadata.xml")]
     },
     "3": {
-        "local": ["extended.xml"]
+        "local": [full_path("extended.xml")]
     },
     "7": {
-        "local": ["metadata_sp_1.xml", "InCommon-metadata.xml"],
+        "local": [full_path("metadata_sp_1.xml"),
+                  full_path("InCommon-metadata.xml")],
         "remote": [
             {"url": "https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2",
-             "cert": "kalmar2.pem"}]
+             "cert": full_path("kalmar2.pem")}]
     },
     "4": {
-        "local": ["metadata_example.xml"]
+        "local": [full_path("metadata_example.xml")]
     },
     "5": {
-        "local": ["metadata.aaitest.xml"]
+        "local": [full_path("metadata.aaitest.xml")]
     },
     "6": {
-        "local": ["metasp.xml"]
+        "local": [full_path("metasp.xml")]
     }
 }
 
@@ -233,3 +236,6 @@ def test_sp_metadata():
                 'urn:oid:0.9.2342.19200300.100.1.3'])
     assert _eq([n["friendly_name"] for n in req["required"]],
                ['surName', 'givenName', 'mail'])
+
+if __name__ == "__main__":
+    test_swami_1()