summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-02 11:44:24 +0200
committerKali Kaneko <kali@leap.se>2013-08-02 11:44:24 +0200
commit89934702c57fa2314f0d6d1f82942f6f42d10f94 (patch)
treed59696d044c9e7a9eceeee084b8ef69b8bd5cd9b /src/leap
parent08a6f880b64b46db5d4efdcfc48c2cddec589f67 (diff)
parentc0b079cd7dffd50ededacd5b0ff73f29d2641c28 (diff)
Merge remote-tracking branch 'ivan-github/feature/fix-test-and-pep8' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/config/tests/test_providerconfig.py4
-rw-r--r--src/leap/services/soledad/soledadbootstrapper.py13
2 files changed, 8 insertions, 9 deletions
diff --git a/src/leap/config/tests/test_providerconfig.py b/src/leap/config/tests/test_providerconfig.py
index 4e86a5f7..ff2828e6 100644
--- a/src/leap/config/tests/test_providerconfig.py
+++ b/src/leap/config/tests/test_providerconfig.py
@@ -28,7 +28,7 @@ import json
import copy
from leap.common.testing.basetest import BaseLeapTest
-from leap.config.providerconfig import ProviderConfig
+from leap.config.providerconfig import ProviderConfig, MissingCACert
from leap.services import get_supported
from mock import Mock
@@ -209,7 +209,7 @@ class ProviderConfigTest(BaseLeapTest):
provider_domain = 'test.provider.com'
pc.get_domain = Mock(return_value=provider_domain)
- with self.assertRaises(AssertionError):
+ with self.assertRaises(MissingCACert):
pc.get_ca_cert_path()
def test_provides_eip(self):
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index ac063152..6f0c88b4 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -91,9 +91,8 @@ class SoledadBootstrapper(AbstractBootstrapper):
if len(server_dict.keys() > 0):
selected_server = server_dict[server_dict.keys()[0]]
- server_url = "https://%s:%s/user-%s" % (selected_server["hostname"],
- selected_server["port"],
- uuid)
+ server_url = "https://%s:%s/user-%s" % (
+ selected_server["hostname"], selected_server["port"], uuid)
logger.debug("Using soledad server url: %s" % (server_url,))
@@ -159,10 +158,10 @@ class SoledadBootstrapper(AbstractBootstrapper):
# Not modified
if res.status_code == 304:
logger.debug("Soledad definition has not been modified")
- self._soledad_config.load(os.path.join("leap",
- "providers",
- self._provider_config.get_domain(),
- "soledad-service.json"))
+ self._soledad_config.load(
+ os.path.join("leap", "providers",
+ self._provider_config.get_domain(),
+ "soledad-service.json"))
else:
soledad_definition, mtime = get_content(res)