EnvironBuilder closes all files

Author: davidism

CHANGES.rst

@@ -16,6 +16,8 @@ Unreleased
     the request was ``POST``. :pr:`3091`
 -   The test client does not handle ``305`` as a redirect, as it is no longer
     part of the HTTP spec. :pr:`3091`
+-   ``EnvironBuilder.close`` closes all open files in ``files`` rather than only
+    the first for each key. :pr:`3091`
 
 
 Version 3.1.5

src/werkzeug/datastructures/file_storage.py

@@ -204,6 +204,16 @@ def add_file(
 
         self.add(name, FileStorage(file_obj, filename, name, content_type))
 
+    def close(self) -> None:
+        """Call :meth:`~FileStorage.close` on every open file.
+
+        .. versionadded:: 3.2
+        """
+        for values in self.listvalues():
+            for value in values:
+                if not value.closed:
+                    value.close()
+
 
 # circular dependencies
 from .. import http  # noqa: E402

src/werkzeug/test.py

@@ -653,15 +653,10 @@ def close(self) -> None:
         """
         if self.closed:
             return
-        try:
-            files = self.files.values()
-        except AttributeError:
-            files = ()
-        for f in files:
-            try:
-                f.close()
-            except Exception:
-                pass
+
+        if self._files is not None:
+            self.files.close()
+
         self.closed = True
 
     def get_environ(self) -> WSGIEnvironment:

tests/test_test.py

@@ -1,3 +1,4 @@
+import io
 import json
 import sys
 from functools import partial
@@ -425,12 +426,10 @@ def test_builder_from_environ():
 def test_file_closing():
     closed = []
 
-    class SpecialInput:
-        def read(self, size):
-            return b""
-
+    class SpecialInput(io.BytesIO):
         def close(self):
             closed.append(self)
+            super().close()
 
     create_environ(data={"foo": SpecialInput()})
     assert len(closed) == 1