review suggestions

Author: prashantmital

test/test_encryption.py

@@ -1108,20 +1108,16 @@ def test_05_endpoint_invalid_host(self):
 
 
 class AzureGCPEncryptionTestMixin(object):
+    DEK = None
     KMS_PROVIDER_MAP = None
     KEYVAULT_DB = 'keyvault'
     KEYVAULT_COLL = 'datakeys'
 
-    def read_extjson(self, filename):
-        with open(os.path.join(BASE, 'custom', filename), 'r') as fp:
-            return json_util.loads(fp.read(), json_options=JSON_OPTS)
-
-    def setup_keyvault(self, DEK):
-        keyvault = self.client.get_database(self.KEYVAULT_DB).get_collection(
-            self.KEYVAULT_COLL, codec_options=OPTS,
-            write_concern=WriteConcern('majority'))
-        keyvault.drop()
-        keyvault.insert_one(DEK)
+    def setUp(self):
+        keyvault = self.client.get_database(
+            self.KEYVAULT_DB).get_collection(
+            self.KEYVAULT_COLL)
+        create_key_vault(keyvault, self.DEK)
 
     def _test_explicit(self, expectation):
         client_encryption = ClientEncryption(
@@ -1141,10 +1137,11 @@ def _test_explicit(self, expectation):
     def _test_automatic(self, expectation_extjson, payload):
         encrypted_db = "db"
         encrypted_coll = "coll"
+        keyvault_namespace = '.'.join([self.KEYVAULT_DB, self.KEYVAULT_COLL])
 
         encryption_opts = AutoEncryptionOpts(
             self.KMS_PROVIDER_MAP,
-            '.'.join([self.KEYVAULT_DB, self.KEYVAULT_COLL]),
+            keyvault_namespace,
             schema_map=self.SCHEMA_MAP)
 
         insert_listener = WhiteListEventListener('insert')
@@ -1181,7 +1178,6 @@ def _test_automatic(self, expectation_extjson, payload):
 class TestAzureEncryption(AzureGCPEncryptionTestMixin,
                           EncryptionIntegrationTest):
     @classmethod
-    @unittest.skipUnless(_HAVE_PYMONGOCRYPT, 'pymongocrypt is not installed')
     @unittest.skipUnless(any(AZURE_CREDS.values()),
                          'Azure environment credentials are not set')
     def setUpClass(cls):
@@ -1190,9 +1186,6 @@ def setUpClass(cls):
         cls.SCHEMA_MAP = json_data(BASE, 'custom', 'azure-gcp-schema.json')
         super(TestAzureEncryption, cls).setUpClass()
 
-    def setUp(self):
-        self.setup_keyvault(self.DEK)
-
     def test_explicit(self):
         return self._test_explicit(
             'AQLN1ERNY0XMhzj42i1hzlwC8/OSU9bHfaQRmmRF5l7d5ZpqJX13qF5zSyExo8N9c1b6uS/LoKrHNzcEMKNrkpi3jf2HiShTFRF0xi8AOD9yfw==')
@@ -1216,7 +1209,6 @@ def test_automatic(self):
 class TestGCPEncryption(AzureGCPEncryptionTestMixin,
                         EncryptionIntegrationTest):
     @classmethod
-    @unittest.skipUnless(_HAVE_PYMONGOCRYPT, 'pymongocrypt is not installed')
     @unittest.skipUnless(any(GCP_CREDS.values()),
                          'GCP environment credentials are not set')
     def setUpClass(cls):
@@ -1225,9 +1217,6 @@ def setUpClass(cls):
         cls.SCHEMA_MAP = json_data(BASE, 'custom', 'azure-gcp-schema.json')
         super(TestGCPEncryption, cls).setUpClass()
 
-    def setUp(self):
-        self.setup_keyvault(self.DEK)
-
     def test_explicit(self):
         return self._test_explicit(
             'AaLFPEi8SURzjW5fDoeaPnoCGcOFAmFOPpn5584VPJJ8iXIgml3YDxMRZD9IWv5otyoft8fBzL1LsDEp0lTeB32cV1gOj0IYeAKHhGIleuHZtA==')