Fixed certificates initialization and removed which_api_bundle

2 files changed, 9 insertions, 11 deletions

diff --git a/service/test/unit/bitmask_libraries/test_certs.py b/service/test/unit/bitmask_libraries/test_certs.py
index 4a06649d..814f083f 100644
--- a/service/test/unit/bitmask_libraries/test_certs.py
+++ b/service/test/unit/bitmask_libraries/test_certs.py
@@ -1,6 +1,6 @@
 import unittest
 
-from pixelated.bitmask_libraries.certs import which_bootstrap_CA_bundle, which_api_CA_bundle
+from pixelated.bitmask_libraries.certs import LeapCertificate
 from pixelated.bitmask_libraries.config import AUTO_DETECT_CA_BUNDLE
 from mock import MagicMock, patch
 
@@ -9,27 +9,25 @@ class CertsTest(unittest.TestCase):
 
     @patch('pixelated.bitmask_libraries.certs.os.path.isfile')
     @patch('pixelated.bitmask_libraries.certs.os.path.isdir')
-    def test_that_which_bootstrap_cert_bundle_returns_byte_string(self, mock_isdir, mock_isfile):
+    def test_that_which_bootstrap_cert_bundle_returns_string(self, mock_isdir, mock_isfile):
         mock_isfile.return_value = True
         mock_isdir.return_value = True
         config = MagicMock(bootstrap_ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, leap_home='/leap/home')
         provider = MagicMock(server_name=u'test.leap.net', config=config)
 
-        bundle = which_bootstrap_CA_bundle(provider)
+        bundle = LeapCertificate(provider).auto_detect_bootstrap_ca_bundle()
 
         self.assertEqual('/leap/home/providers/test.leap.net/test.leap.net.ca.crt', bundle)
-        self.assertEqual(str, type(bundle))
 
     @patch('pixelated.bitmask_libraries.certs.os.path.isfile')
     @patch('pixelated.bitmask_libraries.certs.os.path.isdir')
-    def test_that_which_bundle_returns_byte_string(self, mock_isdir, mock_isfile):
+    def test_that_which_bundle_returns_string(self, mock_isdir, mock_isfile):
         mock_isfile.return_value = True
         mock_isdir.return_value = True
 
         config = MagicMock(bootstrap_ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, ca_cert_bundle=None, leap_home='/some/leap/home')
         provider = MagicMock(server_name=u'test.leap.net', config=config)
 
-        bundle = which_api_CA_bundle(provider)
+        bundle = LeapCertificate(provider).api_ca_bundle()
 
         self.assertEqual('/some/leap/home/providers/test.leap.net/keys/client/api.pem', bundle)
-        self.assertEqual(str, type(bundle))
diff --git a/service/test/unit/bitmask_libraries/test_provider.py b/service/test/unit/bitmask_libraries/test_provider.py
index 0771c7cc..5b5c2034 100644
--- a/service/test/unit/bitmask_libraries/test_provider.py
+++ b/service/test/unit/bitmask_libraries/test_provider.py
@@ -220,11 +220,11 @@ class LeapProviderTest(AbstractLeapTest):
         session_func = MagicMock(return_value=session)
 
         with patch('pixelated.bitmask_libraries.provider.which_bootstrap_cert_fingerprint', return_value='some fingerprint'):
-            with patch('pixelated.bitmask_libraries.provider.which_bootstrap_CA_bundle', return_value=False):
                 with patch('pixelated.bitmask_libraries.provider.requests.session', new=session_func):
-                    with HTTMock(provider_json_mock, ca_cert_mock, not_found_mock):
-                        provider = LeapProvider('some-provider.test', self.config)
-                        provider.fetch_valid_certificate()
+                    with patch('pixelated.bitmask_libraries.certs.LeapCertificate.auto_detect_bootstrap_ca_bundle', return_value=False):
+                        with HTTMock(provider_json_mock, ca_cert_mock, not_found_mock):
+                            provider = LeapProvider('some-provider.test', self.config)
+                            provider.fetch_valid_certificate()
 
         session.get.assert_any_call('https://some-provider.test/ca.crt', verify=False, timeout=15)
         session.mount.assert_called_with('https://', ANY)