resolve warnings

googleapis · Dec 3, 2023 · c767140 · c767140
1 parent 8bec8bd
commit c767140
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 19 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -15,6 +15,7 @@ filterwarnings =
     ignore:.*is using a pure python implementation:RuntimeWarning
     # Remove once https://github.com/googleapis/python-storage/issues/1194 is fixed
     ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning
+    # Remove once https://github.com/dateutil/dateutil/issues/1314 is fixed
     # dateutil is a dependency of pandas
     ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:dateutil.tz.tz
     # Remove once https://github.com/googleapis/python-storage/issues/1195 is fixed

diff --git a/tests/system/test_blob.py b/tests/system/test_blob.py
@@ -18,7 +18,6 @@
 import os
 import tempfile
 import uuid
-import warnings
 
 import pytest
 import mock
@@ -862,7 +861,10 @@ def test_blob_compose_w_generation_match_list(shared_bucket, blobs_to_delete):
     to_append.upload_from_string(payload_to_append)
     blobs_to_delete.append(to_append)
 
-    with warnings.catch_warnings(record=True) as log:
+    with pytest.warns(
+        DeprecationWarning,
+        match="'if_generation_match: type list' is deprecated and supported for backwards-compatability reasons only",
+    ) as log:
         with pytest.raises(exceptions.PreconditionFailed):
             original.compose(
                 [original, to_append],
@@ -871,7 +873,10 @@ def test_blob_compose_w_generation_match_list(shared_bucket, blobs_to_delete):
             )
     assert len(log) == 2
 
-    with warnings.catch_warnings(record=True) as log:
+    with pytest.warns(
+        DeprecationWarning,
+        match="'if_generation_match: type list' is deprecated and supported for backwards-compatability reasons only",
+    ) as log:
         original.compose(
             [original, to_append],
             if_generation_match=[original.generation, to_append.generation],

diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py
@@ -206,9 +206,13 @@ def test_bucket_get_set_iam_policy(
 
 def test_bucket_crud_w_requester_pays(storage_client, buckets_to_delete, user_project):
     bucket_name = _helpers.unique_name("w-requester-pays")
-    created = _helpers.retry_429_503(storage_client.create_bucket)(
-        bucket_name, requester_pays=True
-    )
+    with pytest.warns(
+        PendingDeprecationWarning,
+        match="requester_pays arg is deprecated. Use Bucket().requester_pays instead",
+    ):
+        created = _helpers.retry_429_503(storage_client.create_bucket)(
+            bucket_name, requester_pays=True
+        )
     buckets_to_delete.append(created)
     assert created.name == bucket_name
     assert created.requester_pays
@@ -248,10 +252,14 @@ def test_bucket_acls_iam_w_user_project(
     storage_client, buckets_to_delete, user_project
 ):
     bucket_name = _helpers.unique_name("acl-w-user-project")
-    created = _helpers.retry_429_503(storage_client.create_bucket)(
-        bucket_name,
-        requester_pays=True,
-    )
+    with pytest.warns(
+        PendingDeprecationWarning,
+        match="requester_pays arg is deprecated. Use Bucket().requester_pays instead",
+    ):
+        created = _helpers.retry_429_503(storage_client.create_bucket)(
+            bucket_name,
+            requester_pays=True,
+        )
     buckets_to_delete.append(created)
 
     with_user_project = storage_client.bucket(bucket_name, user_project=user_project)
@@ -354,9 +362,13 @@ def test_bucket_copy_blob_w_user_project(
 ):
     payload = b"DEADBEEF"
     bucket_name = _helpers.unique_name("copy-w-requester-pays")
-    created = _helpers.retry_429_503(storage_client.create_bucket)(
-        bucket_name, requester_pays=True
-    )
+    with pytest.warns(
+        PendingDeprecationWarning,
+        match="requester_pays arg is deprecated. Use Bucket().requester_pays instead",
+    ):
+        created = _helpers.retry_429_503(storage_client.create_bucket)(
+            bucket_name, requester_pays=True
+        )
     buckets_to_delete.append(created)
     assert created.name == bucket_name
     assert created.requester_pays
@@ -410,9 +422,13 @@ def test_bucket_copy_blob_w_metageneration_match(
 ):
     payload = b"DEADBEEF"
     bucket_name = _helpers.unique_name("generation-match")
-    created = _helpers.retry_429_503(storage_client.create_bucket)(
-        bucket_name, requester_pays=True
-    )
+    with pytest.warns(
+        PendingDeprecationWarning,
+        match="requester_pays arg is deprecated.",
+    ):
+        created = _helpers.retry_429_503(storage_client.create_bucket)(
+            bucket_name, requester_pays=True
+        )
     buckets_to_delete.append(created)
     assert created.name == bucket_name
 
@@ -442,9 +458,13 @@ def test_bucket_get_blob_with_user_project(
     blob_name = "blob-name"
     payload = b"DEADBEEF"
     bucket_name = _helpers.unique_name("w-requester-pays")
-    created = _helpers.retry_429_503(storage_client.create_bucket)(
-        bucket_name, requester_pays=True
-    )
+    with pytest.warns(
+        PendingDeprecationWarning,
+        match="requester_pays arg is deprecated. Use Bucket().requester_pays instead",
+    ):
+        created = _helpers.retry_429_503(storage_client.create_bucket)(
+            bucket_name, requester_pays=True
+        )
     buckets_to_delete.append(created)
     assert created.name == bucket_name
     assert created.requester_pays