summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-01 11:53:12 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-01 11:53:12 -0300
commit95b69d0d2e9801e4db1fe3758b62ab9539ecf882 (patch)
tree81a6b3d7d8a70e4355b97a0cb2b3b61102a59e1e /src/leap/bitmask/services
parent487993d08cc2e12fdb9c9edcddff5727479e815d (diff)
parent924264776e8dab3c17c09a3188ae701edbaf797b (diff)
Merge remote-tracking branch 'ivan/feature/update-failing-tests' into develop
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r--src/leap/bitmask/services/eip/tests/test_eipconfig.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/leap/bitmask/services/eip/tests/test_eipconfig.py b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
index 76305e83..4e340f4c 100644
--- a/src/leap/bitmask/services/eip/tests/test_eipconfig.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
@@ -262,15 +262,13 @@ class EIPConfigTest(BaseLeapTest):
def test_get_client_cert_path_as_expected(self):
config = self._get_eipconfig()
- config.get_path_prefix = Mock(return_value='test')
-
provider_config = ProviderConfig()
# mock 'get_domain' so we don't need to load a config
provider_domain = 'test.provider.com'
provider_config.get_domain = Mock(return_value=provider_domain)
- expected_path = os.path.join('test', 'leap', 'providers',
+ expected_path = os.path.join('leap', 'providers',
provider_domain, 'keys', 'client',
'openvpn.pem')
@@ -278,26 +276,24 @@ class EIPConfigTest(BaseLeapTest):
os.path.exists = Mock(return_value=True)
cert_path = config.get_client_cert_path(provider_config)
- self.assertEqual(cert_path, expected_path)
+ self.assertTrue(cert_path.endswith(expected_path))
def test_get_client_cert_path_about_to_download(self):
config = self._get_eipconfig()
- config.get_path_prefix = Mock(return_value='test')
-
provider_config = ProviderConfig()
# mock 'get_domain' so we don't need to load a config
provider_domain = 'test.provider.com'
provider_config.get_domain = Mock(return_value=provider_domain)
- expected_path = os.path.join('test', 'leap', 'providers',
+ expected_path = os.path.join('leap', 'providers',
provider_domain, 'keys', 'client',
'openvpn.pem')
cert_path = config.get_client_cert_path(
provider_config, about_to_download=True)
- self.assertEqual(cert_path, expected_path)
+ self.assertTrue(cert_path.endswith(expected_path))
def test_get_client_cert_path_fails(self):
config = self._get_eipconfig()