fix handling of dropped encryption collections

Author: blink1073

test/asynchronous/unified_format.py

@@ -483,6 +483,12 @@ async def insert_initial_data(self, initial_data):
             else:
                 wc = WriteConcern(w=1)
 
+            # Remove any encryption collections associated with the collection.
+            collections = await db.list_collection_names()
+            for collection in collections:
+                if collection in [f"enxcol_.{coll_name}.esc", f"enxcol_.{coll_name}.ecoc"]:
+                    await db.drop_collection(collection)
+
             if documents:
                 if opts:
                     await db.create_collection(coll_name, **opts)
@@ -491,12 +497,6 @@ async def insert_initial_data(self, initial_data):
                 # Ensure collection exists
                 await db.create_collection(coll_name, write_concern=wc, **opts)
 
-            # Remove any encryption collections associated with the collection.
-            collections = await db.list_collection_names()
-            for collection in collections:
-                if collection in [f"nxcol_{coll_name}.esc", "enxcol_{coll_name}.ecoc"]:
-                    await db.drop_collection(collection)
-
     @classmethod
     def setUpClass(cls) -> None:
         # Speed up the tests by decreasing the heartbeat frequency.

test/unified_format.py

@@ -482,6 +482,12 @@ def insert_initial_data(self, initial_data):
             else:
                 wc = WriteConcern(w=1)
 
+            # Remove any encryption collections associated with the collection.
+            collections = db.list_collection_names()
+            for collection in collections:
+                if collection in [f"enxcol_.{coll_name}.esc", f"enxcol_.{coll_name}.ecoc"]:
+                    db.drop_collection(collection)
+
             if documents:
                 if opts:
                     db.create_collection(coll_name, **opts)
@@ -490,12 +496,6 @@ def insert_initial_data(self, initial_data):
                 # Ensure collection exists
                 db.create_collection(coll_name, write_concern=wc, **opts)
 
-            # Remove any encryption collections associated with the collection.
-            collections = db.list_collection_names()
-            for collection in collections:
-                if collection in [f"nxcol_{coll_name}.esc", "enxcol_{coll_name}.ecoc"]:
-                    db.drop_collection(collection)
-
     @classmethod
     def setUpClass(cls) -> None:
         # Speed up the tests by decreasing the heartbeat frequency.