From 3e9a32625a9adbf557d6b3b1d3954e455fb75356 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 13 Sep 2016 17:52:44 -0300 Subject: [#778] Isolated and fixed keymanager tests We covered a lot of missing cases on the keymanager tests. We also isolated these tests, that caused some other tests to break, so we fixed them. --- service/test/unit/bitmask_libraries/test_provider.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'service/test/unit/bitmask_libraries/test_provider.py') diff --git a/service/test/unit/bitmask_libraries/test_provider.py b/service/test/unit/bitmask_libraries/test_provider.py index 4e7c565f..708b05b6 100644 --- a/service/test/unit/bitmask_libraries/test_provider.py +++ b/service/test/unit/bitmask_libraries/test_provider.py @@ -139,9 +139,12 @@ PROVIDER_WEB_CERT = '/tmp/bootstrap-ca.crt' class LeapProviderTest(AbstractLeapTest): def setUp(self): - leap_config.set_leap_home('/tmp/foobar') + leap_config.leap_home = '/tmp/foobar' LeapCertificate.set_cert_and_fingerprint(PROVIDER_WEB_CERT, None) + def tearDown(self): + reload(leap_config) + def test_provider_fetches_provider_json(self): with HTTMock(provider_json_mock, soledad_json_mock): provider = LeapProvider('some-provider.test') @@ -212,7 +215,7 @@ class LeapProviderTest(AbstractLeapTest): with HTTMock(provider_json_mock, soledad_json_mock, not_found_mock): provider = LeapProvider('some-provider.test') provider.fetch_soledad_json() - get_func.assert_called_with('https://api.some-provider.test:4430/1/config/soledad-service.json', verify='/some/leap/home/providers/some-provider.test/keys/client/api.pem', timeout=15) + get_func.assert_called_with('https://api.some-provider.test:4430/1/config/soledad-service.json', verify='/tmp/foobar/providers/some-provider.test/keys/client/api.pem', timeout=15) def test_that_leap_fingerprint_is_validated(self): session = MagicMock(wraps=requests.session()) @@ -232,4 +235,4 @@ class LeapProviderTest(AbstractLeapTest): provider = LeapProvider('some-provider.test') certs = provider.provider_api_cert - self.assertEqual('/some/leap/home/providers/some-provider.test/keys/client/api.pem', certs) + self.assertEqual('/tmp/foobar/providers/some-provider.test/keys/client/api.pem', certs) -- cgit v1.2.3