Heavy rework on certs, removed most of it, simplified the logic

1 files changed, 12 insertions, 18 deletions

diff --git a/service/test/unit/bitmask_libraries/test_certs.py b/service/test/unit/bitmask_libraries/test_certs.py
index 814f083f..150a1f14 100644
--- a/service/test/unit/bitmask_libraries/test_certs.py
+++ b/service/test/unit/bitmask_libraries/test_certs.py
@@ -1,33 +1,27 @@
 import unittest
 
 from pixelated.bitmask_libraries.certs import LeapCertificate
-from pixelated.bitmask_libraries.config import AUTO_DETECT_CA_BUNDLE
 from mock import MagicMock, patch
 
 
 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_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)
+    def test_set_cert_and_fingerprint_sets_cert(self):
+        LeapCertificate.set_cert_and_fingerprint('some cert', None)
 
-        bundle = LeapCertificate(provider).auto_detect_bootstrap_ca_bundle()
+        self.assertIsNone(LeapCertificate.LEAP_FINGERPRINT)
+        self.assertEqual('some cert', LeapCertificate.LEAP_CERT)
 
-        self.assertEqual('/leap/home/providers/test.leap.net/test.leap.net.ca.crt', bundle)
+    def test_set_cert_and_fingerprint_sets_fingerprint(self):
+        LeapCertificate.set_cert_and_fingerprint(None, 'fingerprint')
 
-    @patch('pixelated.bitmask_libraries.certs.os.path.isfile')
-    @patch('pixelated.bitmask_libraries.certs.os.path.isdir')
-    def test_that_which_bundle_returns_string(self, mock_isdir, mock_isfile):
-        mock_isfile.return_value = True
-        mock_isdir.return_value = True
+        self.assertEqual('fingerprint', LeapCertificate.LEAP_FINGERPRINT)
+        self.assertFalse(LeapCertificate.LEAP_CERT)
 
-        config = MagicMock(bootstrap_ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, ca_cert_bundle=None, leap_home='/some/leap/home')
+    def test_api_ca_bundle(self):
+        config = MagicMock(leap_home='/some/leap/home')
         provider = MagicMock(server_name=u'test.leap.net', config=config)
 
-        bundle = LeapCertificate(provider).api_ca_bundle()
+        cert = LeapCertificate(provider).api_ca_bundle
 
-        self.assertEqual('/some/leap/home/providers/test.leap.net/keys/client/api.pem', bundle)
+        self.assertEqual('/some/leap/home/providers/test.leap.net/keys/client/api.pem', cert)