summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/eip
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/services/eip
parent1bd344982eb0ea8cda46ea268237954cc219d536 (diff)
parentc9742f3549d07c23f5caf8a8e48317a4fb5e75a3 (diff)
Merge remote-tracking branch 'chiiph/bug/fix_more_tests' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip')
-rw-r--r--src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
index fed4a783..6640a860 100644
--- a/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
@@ -41,6 +41,7 @@ from leap.bitmask.services.eip.eipconfig import EIPConfig
from leap.bitmask.config.providerconfig import ProviderConfig
from leap.bitmask.crypto.tests import fake_provider
from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask import util
from leap.common.testing.basetest import BaseLeapTest
from leap.common.files import mkdir_p
@@ -60,13 +61,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
def setUp(self):
self.eb = EIPBootstrapper()
- self.old_pp = EIPConfig.get_path_prefix
+ self.old_pp = util.get_path_prefix
self.old_save = EIPConfig.save
self.old_load = EIPConfig.load
self.old_si = SRPAuth.get_session_id
def tearDown(self):
- EIPConfig.get_path_prefix = self.old_pp
+ util.get_path_prefix = self.old_pp
EIPConfig.save = self.old_save
EIPConfig.load = self.old_load
SRPAuth.get_session_id = self.old_si
@@ -97,13 +98,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
pc.get_ca_cert_path = mock.MagicMock(return_value=False)
path_prefix = tempfile.mkdtemp()
- EIPConfig.get_path_prefix = mock.MagicMock(return_value=path_prefix)
+ util.get_path_prefix = mock.MagicMock(return_value=path_prefix)
EIPConfig.save = mock.MagicMock()
EIPConfig.load = mock.MagicMock()
self.eb._download_if_needed = ifneeded
- provider_dir = os.path.join(EIPConfig.get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap",
"providers",
pc.get_domain())
@@ -184,13 +185,13 @@ class EIPBootstrapperActiveTest(BaseLeapTest):
pc.get_ca_cert_path = mock.MagicMock(return_value=False)
path_prefix = tempfile.mkdtemp()
- EIPConfig.get_path_prefix = mock.MagicMock(return_value=path_prefix)
+ util.get_path_prefix = mock.MagicMock(return_value=path_prefix)
EIPConfig.save = mock.MagicMock()
EIPConfig.load = mock.MagicMock()
self.eb._download_if_needed = ifneeded
- provider_dir = os.path.join(EIPConfig.get_path_prefix(),
+ provider_dir = os.path.join(util.get_path_prefix(),
"leap",
"providers",
"somedomain")