diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
| commit | 5d573b4f10109811b1ec7d277dfb15c548f00530 (patch) | |
| tree | 3de86f0c027a29f7dfb2dac94e3d7f9251f1018b /src/leap/bitmask/config/tests/test_providerconfig.py | |
| parent | 5111539437aa98660e72a19e2468b3e3fac44942 (diff) | |
| parent | 584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff) | |
Merge tag '0.3.4' into debian
Tag leap.bitmask version 0.3.4
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/bitmask/config/tests/test_providerconfig.py')
| -rw-r--r-- | src/leap/bitmask/config/tests/test_providerconfig.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/leap/bitmask/config/tests/test_providerconfig.py b/src/leap/bitmask/config/tests/test_providerconfig.py index 7661a1ce..fe27e683 100644 --- a/src/leap/bitmask/config/tests/test_providerconfig.py +++ b/src/leap/bitmask/config/tests/test_providerconfig.py @@ -175,10 +175,9 @@ class ProviderConfigTest(BaseLeapTest): def test_get_ca_cert_path_as_expected(self): pc = self._provider_config - pc.get_path_prefix = Mock(return_value='test') provider_domain = sample_config['domain'] - expected_path = os.path.join('test', 'leap', 'providers', + expected_path = os.path.join('leap', 'providers', provider_domain, 'keys', 'ca', 'cacert.pem') @@ -186,24 +185,21 @@ class ProviderConfigTest(BaseLeapTest): os.path.exists = Mock(return_value=True) cert_path = pc.get_ca_cert_path() - self.assertEqual(cert_path, expected_path) + self.assertTrue(cert_path.endswith(expected_path)) def test_get_ca_cert_path_about_to_download(self): pc = self._provider_config - pc.get_path_prefix = Mock(return_value='test') provider_domain = sample_config['domain'] - expected_path = os.path.join('test', 'leap', 'providers', + expected_path = os.path.join('leap', 'providers', provider_domain, 'keys', 'ca', 'cacert.pem') cert_path = pc.get_ca_cert_path(about_to_download=True) - - self.assertEqual(cert_path, expected_path) + self.assertTrue(cert_path.endswith(expected_path)) def test_get_ca_cert_path_fails(self): pc = self._provider_config - pc.get_path_prefix = Mock(return_value='test') # mock 'get_domain' so we don't need to load a config provider_domain = 'test.provider.com' |