Fix: BlobWriter.close() will do nothing if already closed

googleapis · Oct 12, 2022 · 49cc29c · 49cc29c
1 parent 3d84972
commit 49cc29c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/google/cloud/storage/fileio.py b/google/cloud/storage/fileio.py
@@ -423,9 +423,8 @@ def flush(self):
             )
 
     def close(self):
-        self._checkClosed()  # Raises ValueError if closed.
-
-        self._upload_chunks_from_buffer(1)
+        if not self._buffer.closed:
+            self._upload_chunks_from_buffer(1)
         self._buffer.close()
 
     def _checkClosed(self):

diff --git a/tests/unit/test_fileio.py b/tests/unit/test_fileio.py
@@ -402,6 +402,9 @@ def test_write(self, mock_warn):
             stacklevel=2,
         )
 
+        # Close a second time to verify it successfully does nothing.
+        writer.close()
+
     def test_flush_fails(self):
         blob = mock.Mock(chunk_size=None)
         writer = self._make_blob_writer(blob)