Dynamic figuring out where xmlsec is.

tests/aa_conf.py

@@ -3,9 +3,10 @@ from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, NAME_FORMAT_URI
 BASE = "http://localhost:8089/"
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG={
     "service":{

tests/idp_conf.py

@@ -3,9 +3,10 @@ from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 BASE = "http://localhost:8088"
 

tests/idp_slo_redirect_conf.py

@@ -3,10 +3,10 @@ from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
-
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idp",

tests/idp_soap_conf.py

@@ -3,9 +3,10 @@ from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG={
     "entityid" : "urn:mace:example.com:saml:roland:idp",

tests/idp_sp_conf.py

@@ -7,10 +7,10 @@ from saml2.saml import NAME_FORMAT_URI
 BASE = "http://localhost:8088/"
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
-
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idp",

tests/restrictive_idp_conf.py

@@ -4,9 +4,10 @@ from saml2.saml import NAME_FORMAT_URI
 BASE = "http://localhost:8089/"
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idpr",

tests/server2_conf.py

@@ -1,7 +1,8 @@
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 
 CONFIG = {

tests/server3_conf.py

@@ -1,7 +1,8 @@
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",

tests/server_conf_syslog.py

@@ -1,9 +1,10 @@
 __author__ = 'rolandh'
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG={
     "entityid" : "urn:mace:example.com:saml:roland:sp",

tests/sp_1_conf.py

@@ -1,7 +1,8 @@
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",

tests/sp_2_conf.py

@@ -1,7 +1,8 @@
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",

tests/sp_slo_redirect_conf.py

@@ -3,9 +3,10 @@ from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
 try:
-    from xmlsec_location import xmlsec_path
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
 except ImportError:
-    xmlsec_path = '/opt/local/bin/xmlsec1'
+    xmlsec_path = '/usr/bin/xmlsec1'
 
 HOME = "http://lingon.catalogix.se:8087/"
 CONFIG = {