summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/provider
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-02 12:55:05 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-02 12:55:05 -0300
commit4f68e75ecbeb44ba391fa16683a9ec223095b8d9 (patch)
tree4781458f90099dcbc98d990c966278a3e92d94f1 /src/leap/bitmask/provider
parent1bd344982eb0ea8cda46ea268237954cc219d536 (diff)
parentc9742f3549d07c23f5caf8a8e48317a4fb5e75a3 (diff)
Merge remote-tracking branch 'chiiph/bug/fix_more_tests' into develop
Diffstat (limited to 'src/leap/bitmask/provider')
-rw-r--r--src/leap/bitmask/provider/providerbootstrapper.py4
-rw-r--r--src/leap/bitmask/provider/tests/test_providerbootstrapper.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/bitmask/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py
index a10973f0..1b5947e1 100644
--- a/src/leap/bitmask/provider/providerbootstrapper.py
+++ b/src/leap/bitmask/provider/providerbootstrapper.py
@@ -27,7 +27,7 @@ from PySide import QtCore
from leap.bitmask.config.providerconfig import ProviderConfig, MissingCACert
from leap.bitmask.util.request_helpers import get_content
-from leap.bitmask.util import get_path_prefix
+from leap.bitmask import util
from leap.bitmask.util.constants import REQUEST_TIMEOUT
from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
from leap.bitmask.provider.supportedapis import SupportedAPIs
@@ -156,7 +156,7 @@ class ProviderBootstrapper(AbstractBootstrapper):
# Watch out! We're handling the verify paramenter differently here.
headers = {}
- provider_json = os.path.join(get_path_prefix(),
+ provider_json = os.path.join(util.get_path_prefix(),
"leap",
"providers",
self._domain, "provider.json")
diff --git a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
index fe5b52bd..88a4ff0b 100644
--- a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
+++ b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py
@@ -43,7 +43,6 @@ from leap.bitmask.provider.providerbootstrapper import UnsupportedProviderAPI
from leap.bitmask.provider.providerbootstrapper import WrongFingerprint
from leap.bitmask.provider.supportedapis import SupportedAPIs
from leap.bitmask import util
-from leap.bitmask.util import get_path_prefix
from leap.common.files import mkdir_p
from leap.common.testing.https_server import where
from leap.common.testing.basetest import BaseLeapTest
@@ -406,7 +405,7 @@ class ProviderBootstrapperActiveTest(unittest.TestCase):
:returns: the provider.json path used
:rtype: str
"""
- provider_dir = os.path.join(get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap", "providers",
self.pb._domain)
mkdir_p(provider_dir)