Merge branch 'main' of github.com:googleapis/python-storage into helpers

Author: chandra-siri

google/cloud/storage/_experimental/asyncio/async_appendable_object_writer.py

@@ -25,6 +25,7 @@
 from typing import Optional, Union
 
 from google_crc32c import Checksum
+from google.api_core import exceptions
 
 from ._utils import raise_if_no_fast_crc32c
 from google.cloud import _storage_v2

tests/system/test_zonal.py

@@ -120,16 +120,12 @@ async def test_basic_wrd(
 @pytest.mark.parametrize(
     "object_size",
     [
-        20 * 1024 * 1024,  # greater than _MAX_BUFFER_SIZE
+        10,  # less than _chunk size,
+        10 * 1024 * 1024,  # less than _MAX_BUFFER_SIZE_BYTES
+        20 * 1024 * 1024,  # greater than _MAX_BUFFER_SIZE_BYTES
     ],
 )
-@pytest.mark.parametrize(
-    "attempt_direct_path",
-    [True],
-)
-async def test_basic_wrd_in_slices(
-    storage_client, blobs_to_delete, attempt_direct_path, object_size
-):
+async def test_basic_wrd_in_slices(storage_client, blobs_to_delete, object_size):
     object_name = f"test_basic_wrd-{str(uuid.uuid4())}"
 
     # Client instantiation; it cannot be part of fixture because.
@@ -142,7 +138,7 @@ async def test_basic_wrd_in_slices(
     #  loop slowing down other tests.
     object_data = os.urandom(object_size)
     object_checksum = google_crc32c.value(object_data)
-    grpc_client = AsyncGrpcClient(attempt_direct_path=attempt_direct_path).grpc_client
+    grpc_client = AsyncGrpcClient().grpc_client
 
     writer = AsyncAppendableObjectWriter(grpc_client, _ZONAL_BUCKET, object_name)
     await writer.open()

tests/unit/asyncio/test_async_appendable_object_writer.py

@@ -555,9 +555,6 @@ async def test_append_flushes_when_buffer_is_full(
 )
 async def test_append_handles_large_data(mock_write_object_stream, mock_client):
     """Test that append handles data larger than the buffer size."""
-    from google.cloud.storage._experimental.asyncio.async_appendable_object_writer import (
-        _DEFAULT_FLUSH_INTERVAL_BYTES,
-    )
 
     writer = AsyncAppendableObjectWriter(mock_client, BUCKET, OBJECT)
     writer._is_stream_open = True