diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-01-15 19:18:05 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-01-16 16:53:28 -0300 |
| commit | 8c71fcd6e070d6bf46394fb29fba4d75c76a3987 (patch) | |
| tree | 35f9083ffdac8537b7ffd5eecec42bd895bdf033 /src/leap/bitmask/services | |
| parent | e7472ad6686e06c2bd78e9f873632b58538f05f7 (diff) | |
Fix failing tests.
Remove srpauth obsolete tests.
Remove providerconfig obsolete test.
Set as mandatory the signaler object on ProviderBootstrapper and
EIPBootstrapper.
Closes #6631.
Diffstat (limited to 'src/leap/bitmask/services')
| -rw-r--r-- | src/leap/bitmask/services/eip/eipbootstrapper.py | 11 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/eipconfig.py | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py index 264eac2e..f78113bc 100644 --- a/src/leap/bitmask/services/eip/eipbootstrapper.py +++ b/src/leap/bitmask/services/eip/eipbootstrapper.py @@ -115,10 +115,15 @@ class EIPBootstrapper(AbstractBootstrapper): self._provider_config = provider_config self._download_if_needed = download_if_needed + eip_config_ready = None + eip_certificate_ready = None + if self._signaler is not None: + eip_config_ready = self._signaler.eip_config_ready + eip_certificate_ready = self._signaler.eip_client_certificate_ready + cb_chain = [ - (self._download_config, self._signaler.eip_config_ready), - (self._download_client_certificates, - self._signaler.eip_client_certificate_ready) + (self._download_config, eip_config_ready), + (self._download_client_certificates, eip_certificate_ready) ] return self.addCallbackChain(cb_chain) diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py index 659ca1b1..f4d6b216 100644 --- a/src/leap/bitmask/services/eip/eipconfig.py +++ b/src/leap/bitmask/services/eip/eipconfig.py @@ -118,6 +118,8 @@ class VPNGatewaySelector(object): """ gateways_timezones = [] locations = self._eipconfig.get_locations() + if not locations: + locations = {} gateways = self._eipconfig.get_gateways() for idx, gateway in enumerate(gateways): |