diff options
| author | Ivan Alejandro <ivanalejandro0@yahoo.com.ar> | 2013-06-27 13:11:29 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@yahoo.com.ar> | 2013-06-27 13:11:29 -0300 |
| commit | 1a1cd679a6f6c86ff8965f26f4fc463b98eba4ec (patch) | |
| tree | 2620ac7257400c437e1687e20474cb8ab218c7d0 /src/leap/services/eip/providerbootstrapper.py | |
| parent | d605043f5754f4f1ea6169a0cfb164928eb9e55a (diff) | |
| parent | c66b1f7287660d349f189b7b316144e4cd72bd72 (diff) | |
Merge branch 'feature/coverage_providerbootstrapper' into develop
Diffstat (limited to 'src/leap/services/eip/providerbootstrapper.py')
| -rw-r--r-- | src/leap/services/eip/providerbootstrapper.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py index e099eee7..754d0643 100644 --- a/src/leap/services/eip/providerbootstrapper.py +++ b/src/leap/services/eip/providerbootstrapper.py @@ -155,7 +155,7 @@ class ProviderBootstrapper(AbstractBootstrapper): if SupportedAPIs.supports(api_version): logger.debug("Provider definition has been modified") else: - api_supported = ', '.join(self._supported_api_versions) + api_supported = ', '.join(SupportedAPIs.SUPPORTED_APIS) error = ('Unsupported provider API version. ' 'Supported versions are: {}. ' 'Found: {}.').format(api_supported, api_version) @@ -185,7 +185,7 @@ class ProviderBootstrapper(AbstractBootstrapper): (self._download_provider_info, self.download_provider_info) ] - self.addCallbackChain(cb_chain) + return self.addCallbackChain(cb_chain) def _should_proceed_cert(self): """ @@ -217,6 +217,7 @@ class ProviderBootstrapper(AbstractBootstrapper): check_and_fix_urw_only( self._provider_config .get_ca_cert_path(about_to_download=True)) + return res = self._session.get(self._provider_config.get_ca_cert_uri(), verify=not self._bypass_checks) @@ -307,4 +308,4 @@ class ProviderBootstrapper(AbstractBootstrapper): (self._check_api_certificate, self.check_api_certificate) ] - self.addCallbackChain(cb_chain) + return self.addCallbackChain(cb_chain) |