Add prose test

Author: NoahStapp

gridfs/asynchronous/grid_file.py

@@ -848,21 +848,20 @@ async def delete_by_name(
           await fs.upload_from_stream("test_file", "data I want to store!")
           await fs.delete_by_name("test_file")
 
-        Raises :exc:`~gridfs.errors.NoFile` if no file with filename exists.
+        Raises :exc:`~gridfs.errors.NoFile` if no file with the given filename exists.
 
         :param filename: The name of the file to be deleted.
-        :param session: a
-            :class:`~pymongo.client_session.AsyncClientSession`
+        :param session: a :class:`~pymongo.client_session.AsyncClientSession`
 
-        .. versionadded:: 4.13
+        .. versionadded:: 4.12
         """
         _disallow_transactions(session)
         files = self._files.find({"filename": filename}, {"_id": 1}, session=session)
         file_ids = [file_id["_id"] async for file_id in files]
         res = await self._files.delete_many({"_id": {"$in": file_ids}}, session=session)
         await self._chunks.delete_many({"files_id": {"$in": file_ids}}, session=session)
         if not res.deleted_count:
-            raise NoFile("no file could be deleted because none matched %s" % filename)
+            raise NoFile(f"no file could be deleted because none matched filename {filename!r}")
 
     def find(self, *args: Any, **kwargs: Any) -> AsyncGridOutCursor:
         """Find and return the files collection documents that match ``filter``

gridfs/synchronous/grid_file.py

@@ -842,21 +842,20 @@ def delete_by_name(self, filename: str, session: Optional[ClientSession] = None)
           fs.upload_from_stream("test_file", "data I want to store!")
           fs.delete_by_name("test_file")
 
-        Raises :exc:`~gridfs.errors.NoFile` if no file with filename exists.
+        Raises :exc:`~gridfs.errors.NoFile` if no file with the given filename exists.
 
         :param filename: The name of the file to be deleted.
-        :param session: a
-            :class:`~pymongo.client_session.ClientSession`
+        :param session: a :class:`~pymongo.client_session.ClientSession`
 
-        .. versionadded:: 4.13
+        .. versionadded:: 4.12
         """
         _disallow_transactions(session)
         files = self._files.find({"filename": filename}, {"_id": 1}, session=session)
         file_ids = [file_id["_id"] for file_id in files]
         res = self._files.delete_many({"_id": {"$in": file_ids}}, session=session)
         self._chunks.delete_many({"files_id": {"$in": file_ids}}, session=session)
         if not res.deleted_count:
-            raise NoFile("no file could be deleted because none matched %s" % filename)
+            raise NoFile(f"no file could be deleted because none matched filename {filename!r}")
 
     def find(self, *args: Any, **kwargs: Any) -> GridOutCursor:
         """Find and return the files collection documents that match ``filter``

test/asynchronous/test_gridfs_bucket.py

@@ -115,6 +115,17 @@ async def test_multi_chunk_delete(self):
         self.assertEqual(0, await self.db.fs.files.count_documents({}))
         self.assertEqual(0, await self.db.fs.chunks.count_documents({}))
 
+    async def test_delete_by_name(self):
+        self.assertEqual(0, await self.db.fs.files.count_documents({}))
+        self.assertEqual(0, await self.db.fs.chunks.count_documents({}))
+        gfs = gridfs.AsyncGridFSBucket(self.db)
+        await gfs.upload_from_stream("test_filename", b"hello", chunk_size_bytes=1)
+        self.assertEqual(1, await self.db.fs.files.count_documents({}))
+        self.assertEqual(5, await self.db.fs.chunks.count_documents({}))
+        await gfs.delete_by_name("test_filename")
+        self.assertEqual(0, await self.db.fs.files.count_documents({}))
+        self.assertEqual(0, await self.db.fs.chunks.count_documents({}))
+
     async def test_empty_file(self):
         oid = await self.fs.upload_from_stream("test_filename", b"")
         self.assertEqual(b"", await (await self.fs.open_download_stream(oid)).read())

test/asynchronous/unified_format.py

@@ -628,10 +628,7 @@ def process_error(self, exception, spec):
             # Connection errors are considered client errors.
             if isinstance(error, ConnectionFailure):
                 self.assertNotIsInstance(error, NotPrimaryError)
-            elif isinstance(error, (InvalidOperation, ConfigurationError, EncryptionError)):
-                pass
-            # gridfs NoFile errors are considered client errors.
-            elif isinstance(error, NoFile):
+            elif isinstance(error, (InvalidOperation, ConfigurationError, EncryptionError, NoFile)):
                 pass
             else:
                 self.assertNotIsInstance(error, PyMongoError)

test/test_gridfs_bucket.py

@@ -115,6 +115,17 @@ def test_multi_chunk_delete(self):
         self.assertEqual(0, self.db.fs.files.count_documents({}))
         self.assertEqual(0, self.db.fs.chunks.count_documents({}))
 
+    def test_delete_by_name(self):
+        self.assertEqual(0, self.db.fs.files.count_documents({}))
+        self.assertEqual(0, self.db.fs.chunks.count_documents({}))
+        gfs = gridfs.GridFSBucket(self.db)
+        gfs.upload_from_stream("test_filename", b"hello", chunk_size_bytes=1)
+        self.assertEqual(1, self.db.fs.files.count_documents({}))
+        self.assertEqual(5, self.db.fs.chunks.count_documents({}))
+        gfs.delete_by_name("test_filename")
+        self.assertEqual(0, self.db.fs.files.count_documents({}))
+        self.assertEqual(0, self.db.fs.chunks.count_documents({}))
+
     def test_empty_file(self):
         oid = self.fs.upload_from_stream("test_filename", b"")
         self.assertEqual(b"", (self.fs.open_download_stream(oid)).read())

test/unified_format.py

@@ -627,10 +627,7 @@ def process_error(self, exception, spec):
             # Connection errors are considered client errors.
             if isinstance(error, ConnectionFailure):
                 self.assertNotIsInstance(error, NotPrimaryError)
-            elif isinstance(error, (InvalidOperation, ConfigurationError, EncryptionError)):
-                pass
-            # gridfs NoFile errors are considered client errors.
-            elif isinstance(error, NoFile):
+            elif isinstance(error, (InvalidOperation, ConfigurationError, EncryptionError, NoFile)):
                 pass
             else:
                 self.assertNotIsInstance(error, PyMongoError)