Correctly handle closing a file descriptor

- could have closed the wrong fd
- fixes #988

Author: mrbean-bremen

pyfakefs/fake_file.py

@@ -845,6 +845,11 @@ def fileno(self) -> int:
 
     def close(self) -> None:
         """Close the file."""
+        self.close_fd(self.filedes)
+
+    def close_fd(self, fd: Optional[int]) -> None:
+        """Close the file for the given file descriptor."""
+
         # ignore closing a closed file
         if not self._is_open():
             return
@@ -864,11 +869,11 @@ def close(self) -> None:
             if self._filesystem.is_windows_fs and self._changed:
                 self.file_object.st_mtime = helpers.now()
 
-        assert self.filedes is not None
+        assert fd is not None
         if self._closefd:
-            self._filesystem.close_open_file(self.filedes)
+            self._filesystem.close_open_file(fd)
         else:
-            open_files = self._filesystem.open_files[self.filedes]
+            open_files = self._filesystem.open_files[fd]
             assert open_files is not None
             open_files.remove(self)
         if self.delete_on_close:
@@ -1256,6 +1261,9 @@ def read(self, n: int = -1) -> bytes:
     def close(self) -> None:
         """We do not support closing standard streams."""
 
+    def close_fd(self, fd: Optional[int]) -> None:
+        """We do not support closing standard streams."""
+
     def is_stream(self) -> bool:
         return True
 
@@ -1287,8 +1295,12 @@ def fileno(self) -> int:
 
     def close(self) -> None:
         """Close the directory."""
-        assert self.filedes is not None
-        self._filesystem.close_open_file(self.filedes)
+        self.close_fd(self.filedes)
+
+    def close_fd(self, fd: Optional[int]) -> None:
+        """Close the directory."""
+        assert fd is not None
+        self._filesystem.close_open_file(fd)
 
 
 class FakePipeWrapper:
@@ -1351,8 +1363,12 @@ def write(self, contents: bytes) -> int:
 
     def close(self) -> None:
         """Close the pipe descriptor."""
-        assert self.filedes is not None
-        open_files = self._filesystem.open_files[self.filedes]
+        self.close_fd(self.filedes)
+
+    def close_fd(self, fd: Optional[int]) -> None:
+        """Close the pipe descriptor with the given file descriptor."""
+        assert fd is not None
+        open_files = self._filesystem.open_files[fd]
         assert open_files is not None
         open_files.remove(self)
         if self.real_file:

pyfakefs/fake_os.py

@@ -326,7 +326,7 @@ def close(self, fd: int) -> None:
             TypeError: if file descriptor is not an integer.
         """
         file_handle = self.filesystem.get_open_file(fd)
-        file_handle.close()
+        file_handle.close_fd(fd)
 
     def dup(self, fd: int) -> int:
         file_handle = self.filesystem.get_open_file(fd)

pyfakefs/tests/fake_os_test.py

@@ -3014,8 +3014,8 @@ def test_dup(self):
         fd2 = self.os.dup(fd1)
         self.assertEqual(b"hey", self.os.read(fd1, 3))
         self.assertEqual(b"there", self.os.read(fd1, 10))
-        self.os.close(fd1)
         self.os.close(fd2)
+        self.os.close(fd1)
 
     def test_dup_uses_freed_fd(self):
         file_path1 = self.make_path("foo.txt")