From f265c3b421b87c951b27306284b1b1725c39c7ab Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 16 Dec 2012 10:11:31 +0100 Subject: [PATCH] Dynamic figuring out where xmlsec is. --- tests/aa_conf.py | 5 +++-- tests/idp_conf.py | 5 +++-- tests/idp_slo_redirect_conf.py | 6 +++--- tests/idp_soap_conf.py | 5 +++-- tests/idp_sp_conf.py | 6 +++--- tests/restrictive_idp_conf.py | 5 +++-- tests/server2_conf.py | 5 +++-- tests/server3_conf.py | 5 +++-- tests/server_conf_syslog.py | 5 +++-- tests/sp_1_conf.py | 5 +++-- tests/sp_2_conf.py | 5 +++-- tests/sp_slo_redirect_conf.py | 5 +++-- 12 files changed, 36 insertions(+), 26 deletions(-) diff --git a/tests/aa_conf.py b/tests/aa_conf.py index fb60127..a76007f 100644 --- a/tests/aa_conf.py +++ b/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":{ diff --git a/tests/idp_conf.py b/tests/idp_conf.py index 53cae8b..da412df 100644 --- a/tests/idp_conf.py +++ b/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" diff --git a/tests/idp_slo_redirect_conf.py b/tests/idp_slo_redirect_conf.py index cea0951..3f5ac9f 100644 --- a/tests/idp_slo_redirect_conf.py +++ b/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", diff --git a/tests/idp_soap_conf.py b/tests/idp_soap_conf.py index 60dcd5b..ecf5eed 100644 --- a/tests/idp_soap_conf.py +++ b/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", diff --git a/tests/idp_sp_conf.py b/tests/idp_sp_conf.py index 1204b11..d8dee28 100644 --- a/tests/idp_sp_conf.py +++ b/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", diff --git a/tests/restrictive_idp_conf.py b/tests/restrictive_idp_conf.py index 1df39b7..9af21a9 100644 --- a/tests/restrictive_idp_conf.py +++ b/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", diff --git a/tests/server2_conf.py b/tests/server2_conf.py index bf64dde..bcb5880 100644 --- a/tests/server2_conf.py +++ b/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 = { diff --git a/tests/server3_conf.py b/tests/server3_conf.py index 5450bc8..b67a4a9 100644 --- a/tests/server3_conf.py +++ b/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", diff --git a/tests/server_conf_syslog.py b/tests/server_conf_syslog.py index 44e04a0..9c5d9ad 100644 --- a/tests/server_conf_syslog.py +++ b/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", diff --git a/tests/sp_1_conf.py b/tests/sp_1_conf.py index bb80bd3..7173fb5 100644 --- a/tests/sp_1_conf.py +++ b/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", diff --git a/tests/sp_2_conf.py b/tests/sp_2_conf.py index 2de3a2b..614e0fa 100644 --- a/tests/sp_2_conf.py +++ b/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", diff --git a/tests/sp_slo_redirect_conf.py b/tests/sp_slo_redirect_conf.py index 7a22b8c..0ad4ce4 100644 --- a/tests/sp_slo_redirect_conf.py +++ b/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 = {